projects
/
mkws-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
802f726
)
Simplify configuration
author
Mike Taylor
<mike@indexdata.com>
Thu, 27 Jun 2013 11:13:44 +0000
(13:13 +0200)
committer
Mike Taylor
<mike@indexdata.com>
Thu, 27 Jun 2013 11:13:44 +0000
(13:13 +0200)
etc/apache2/spclient-live
patch
|
blob
|
history
diff --git
a/etc/apache2/spclient-live
b/etc/apache2/spclient-live
index
11355b8
..
dfa7ed4
100644
(file)
--- a/
etc/apache2/spclient-live
+++ b/
etc/apache2/spclient-live
@@
-25,27
+25,12
@@
RewriteLog /var/log/apache2/mkws-rewrite.log
RewriteRule /service-proxy-auth /service-proxy/?command=auth&action=login&username=demo&password=demo [P] # [NE,P]
RewriteLog /var/log/apache2/mkws-rewrite.log
RewriteRule /service-proxy-auth /service-proxy/?command=auth&action=login&username=demo&password=demo [P] # [NE,P]
-# We want *, but can't use credentials unless we specify a particular origin
-# Instead, we generate the header using mod_perl: see below.
-# Header set Access-Control-Allow-Origin "http://somesite.indexdata.com"
-# Header set Access-Control-Allow-Origin "*"
Header set Access-Control-Allow-Credentials true
# For MKC Service Proxy
ProxyPass /service-proxy/ http://mk2-test.indexdata.com/service-proxy/
ProxyPassReverse /service-proxy/ http://mk2-test.indexdata.com/service-proxy/
Header set Access-Control-Allow-Credentials true
# For MKC Service Proxy
ProxyPass /service-proxy/ http://mk2-test.indexdata.com/service-proxy/
ProxyPassReverse /service-proxy/ http://mk2-test.indexdata.com/service-proxy/
- # Although what follows works perfectly well, it's no use to us:
- # IE8/9 are unable to set or read ANY headers when operating in
- # CORS mode.
- #
- # PerlOptions +Parent
- # PerlSwitches -I/home/indexdata/mkws/etc/mod_perl
- # <Location /service-proxy/>
- # PerlInputFilterHandler MyApache2::CopyCookie
- # PerlOutputFilterHandler MyApache2::CopyCookie
- # </Location>
-
PerlOptions +Parent
PerlSwitches -I/home/indexdata/mkws/etc/mod_perl
<Location /service-proxy>
PerlOptions +Parent
PerlSwitches -I/home/indexdata/mkws/etc/mod_perl
<Location /service-proxy>