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 aac6d2a..64215c2 100644 (file)
--- a/tools/apache2/mkws-live
+++ b/tools/apache2/mkws-live
@@ -14,6 +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]
 
     Header set Access-Control-Allow-Credentials true
 

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index b09ce32..5053027 100644 (file)
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -727,7 +727,10 @@ function mkws_service_proxy_auth(auth_url) {
 
     debug("Run service proxy auth URL: " + auth_url);
 
-    var request = new pzHttpRequest(auth_url);
+    var request = new pzHttpRequest(auth_url, function(err) {
+       alert("HTTP call for authentication failed: " + err)
+       return;
+    });
     request.get(null, function(data) {
        if (!$.isXMLDoc(data)) {
            alert("service proxy auth response document is not valid XML document, give up!");