Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws

[mkws-moved-to-github.git] / tools / apache2 / mkws-live

diff --git a/tools/apache2/mkws-live b/tools/apache2/mkws-live
index 64215c2..e3ed207 100644 (file)
--- a/tools/apache2/mkws-live
+++ b/tools/apache2/mkws-live
@@ -9,12 +9,18 @@
 
     DocumentRoot /home/indexdata/mkws/tools/htdocs
     Alias /libjs-pz2/ /home/indexdata/libjs-pz2/
+    Alias /pazpar2/ /home/indexdata/pazpar2/
 
     RewriteEngine on
     RewriteLogLevel 1
     RewriteLog /var/log/apache2/mkws-rewrite.log 
     RewriteRule /service-proxy-auth /service-proxy/?command=auth&action=login&username=demo&password=demo [P] # [NE,P]
-    RewriteRule /service-proxy/%3F /service-proxy/? [P] # [NE,P]
+
+    # The following rule allows the server to accept service-proxy
+    # requests that begin with an escaped "%3F" rather than a literal
+    # "?". This is useful, as requests generated by ProxyPass
+    # elsewhere always have the leading "?" escaped for some reason.
+    RewriteRule /service-proxy/\?(.*) /service-proxy/?$1 [P] # [NE,P]
 
     Header set Access-Control-Allow-Credentials true