From: Mike Taylor <mike@indexdata.com>
Date: Wed, 22 Jan 2014 15:54:06 +0000 (+0000)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
X-Git-Tag: 1.0.0~1668
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=758eff59c297d8ec0fe709b63d6612729abdc7a8;hp=933299da5719f2b5d12f00ee632ca4fd1ceb1c44;p=mkws-moved-to-github.git

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

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 725754b..439ee36 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -1084,7 +1084,7 @@ function mkws_service_proxy_auth(auth_url, auth_domain, pp2_url) {
     debug("Run service proxy auth URL: " + auth_url);
 
     if (!auth_domain) {
-	auth_domain = pp2_url.replace(/^http:\/\/(.*?)\/.*/, '$1');
+	auth_domain = pp2_url.replace(/^https?:\/\/(.*?)\/.*/, '$1');
 	debug("guessed auth_domain '" + auth_domain + "' from pp2_url '" + pp2_url + "'");
     }