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

diff --git a/etc/apache2/spclient-live b/etc/apache2/spclient-live
index 973df78..66b2489 100644 (file)
--- a/etc/apache2/spclient-live
+++ b/etc/apache2/spclient-live
@@ -23,6 +23,7 @@
     # For MKC Service Proxy
     ProxyPass        /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/
     ProxyPassReverse /service-proxy/ http://mkc.indexdata.com:9009/service-proxy/
+    ProxyPassReverseCookiePath /service-proxy /
 </VirtualHost>
 
 <VirtualHost *:80>

diff --git a/experiments/spclient/Makefile b/experiments/spclient/Makefile
index 4825653..86daeb4 100644 (file)
--- a/experiments/spclient/Makefile
+++ b/experiments/spclient/Makefile
@@ -5,7 +5,7 @@
 MKWS_JS=       mkws-complete.js
 all: ${MKWS_JS}
 
-mkws-js ${MKWS_JS}: mkws.js
+mkws-js ${MKWS_JS}: ../../../libjs-pz2/pz2api.1.js mkws.js
        ( curl -sSf http://code.jquery.com/jquery-1.10.0.min.js; \
          cat ../../../libjs-pz2/pz2api.1.js mkws.js ) > ${MKWS_JS}.new 
        mv -f ${MKWS_JS}.new ${MKWS_JS}