From: Mike Taylor <mike@indexdata.com>
Date: Thu, 22 Aug 2013 11:50:17 +0000 (+0000)
Subject: Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
X-Git-Tag: 0.9.1~228
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=8a85e0a25b1c100347f6363b35320276fdd30034;hp=e299cab8b3ba293f5307984f4da66465b6b6baa4;p=mkws-moved-to-github.git

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

diff --git a/tools/apache2/mkws-live b/tools/apache2/mkws-live
index 64215c2..84cd8db 100644
--- a/tools/apache2/mkws-live
+++ b/tools/apache2/mkws-live
@@ -14,7 +14,7 @@
     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]
+    RewriteRule /service-proxy/\?(.*) /service-proxy/?$1 [P] # [NE,P]
 
     Header set Access-Control-Allow-Credentials true