projects
/
mkws-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f9ad14d
)
The service proxy auth URL shortcut may contain ;jsessionid= as part of the URL path...
author
Wolfram Schneider
<wosch@indexdata.dk>
Fri, 6 Jun 2014 11:11:20 +0000
(11:11 +0000)
committer
Wolfram Schneider
<wosch@indexdata.dk>
Fri, 6 Jun 2014 11:11:20 +0000
(11:11 +0000)
tools/apache2/mkws-git
patch
|
blob
|
history
tools/apache2/mkws-heikki
patch
|
blob
|
history
tools/apache2/mkws-jakub
patch
|
blob
|
history
tools/apache2/mkws-mike-mac
patch
|
blob
|
history
tools/apache2/mkws-ne
patch
|
blob
|
history
diff --git
a/tools/apache2/mkws-git
b/tools/apache2/mkws-git
index
798d561
..
92fa46b
100644
(file)
--- a/
tools/apache2/mkws-git
+++ b/
tools/apache2/mkws-git
@@
-13,7
+13,7
@@
RewriteEngine on
RewriteLogLevel 1
RewriteLog /var/log/apache2/mkws-git-rewrite.log
RewriteEngine on
RewriteLogLevel 1
RewriteLog /var/log/apache2/mkws-git-rewrite.log
- RewriteRule /service-proxy-auth /service-proxy/?command=auth&action=login&username=guest&password=guest [P] # [NE,P]
+ RewriteRule /service-proxy-auth(/)?(;jsessionid=.+)? /service-proxy/$2?command=auth&action=login&username=guest&password=guest [P] # [NE,P]
# The following rule allows the server to accept service-proxy
# requests that begin with an escaped "%3F" rather than a literal
# The following rule allows the server to accept service-proxy
# requests that begin with an escaped "%3F" rather than a literal
diff --git
a/tools/apache2/mkws-heikki
b/tools/apache2/mkws-heikki
index
9206f3b
..
92e135f
100644
(file)
--- a/
tools/apache2/mkws-heikki
+++ b/
tools/apache2/mkws-heikki
@@
-32,7
+32,7
@@
SetOutputFilter DEFLATE
</Location>
SetOutputFilter DEFLATE
</Location>
- RewriteRule /service-proxy-auth/ /service-proxy/?command=auth&action=login&username=demo&password=demo [P] # [NE,P]
+ RewriteRule /service-proxy-auth(/)?(;jsessionid=.+)? /service-proxy/$2?command=auth&action=login&username=demo&password=demo [P] # [NE,P]
# For MKC Service Proxy
ProxyPass /service-proxy/ http://sp-mkc.indexdata.com/service-proxy/
# For MKC Service Proxy
ProxyPass /service-proxy/ http://sp-mkc.indexdata.com/service-proxy/
diff --git
a/tools/apache2/mkws-jakub
b/tools/apache2/mkws-jakub
index
6672676
..
28a9c05
100644
(file)
--- a/
tools/apache2/mkws-jakub
+++ b/
tools/apache2/mkws-jakub
@@
-4,7
+4,7
@@
# auth
RewriteEngine on
# auth
RewriteEngine on
- RewriteRule /service-proxy-auth/ /service-proxy/?command=auth&action=login&use
+ RewriteRule /service-proxy-auth(/)?(;jsessionid=.+)? /service-proxy/$2?command=auth&action=login&use
rname=demo&password=demo [P] # [NE,P]
# allow cors
rname=demo&password=demo [P] # [NE,P]
# allow cors
diff --git
a/tools/apache2/mkws-mike-mac
b/tools/apache2/mkws-mike-mac
index
d781dcb
..
d756148
100644
(file)
--- a/
tools/apache2/mkws-mike-mac
+++ b/
tools/apache2/mkws-mike-mac
@@
-13,7
+13,7
@@
RewriteEngine on
RewriteLogLevel 1
RewriteLog /opt/local/apache2/logs/spclient-rewrite.log
RewriteEngine on
RewriteLogLevel 1
RewriteLog /opt/local/apache2/logs/spclient-rewrite.log
- RewriteRule /service-proxy-auth /service-proxy/?command=auth&action=login&username=guest&password=guest [P] # [NE,P]
+ RewriteRule /service-proxy-auth(/)?(;jsessionid=.+)? /service-proxy/$2?command=auth&action=login&username=guest&password=guest [P] # [NE,P]
# For MKC Service Proxy
ProxyPass /service-proxy/ http://sp-mkc.indexdata.com/service-proxy/
# For MKC Service Proxy
ProxyPass /service-proxy/ http://sp-mkc.indexdata.com/service-proxy/
diff --git
a/tools/apache2/mkws-ne
b/tools/apache2/mkws-ne
index
6b613fd
..
7c9a3e9
100644
(file)
--- a/
tools/apache2/mkws-ne
+++ b/
tools/apache2/mkws-ne
@@
-30,10
+30,10
@@
</Location>
# jasmine test account
</Location>
# jasmine test account
- RewriteRule /service-proxy-testauth /service-proxy/?command=auth&action=login&username=mkwstest&password=mkwstest [P] # [NE,P]
+ RewriteRule /service-proxy-testauth(/)?(;jsessionid=.+)? /service-proxy/$2?command=auth&action=login&username=mkwstest&password=mkwstest [P] # [NE,P]
# mkws devel account (e.g. memached testing)
# mkws devel account (e.g. memached testing)
- RewriteRule /service-proxy-auth /service-proxy/?command=auth&action=login&username=mkwsdev&password=mkwsdev [P] # [NE,P]
+ RewriteRule /service-proxy-auth(/)?(;jsessionid=.+)? /service-proxy/$2?command=auth&action=login&username=mkwsdev&password=mkwsdev [P] # [NE,P]
ProxyPass /service-proxy/ http://sp-mkc.indexdata.com/service-proxy/
ProxyPassReverse /service-proxy/ http://sp-mkc.indexdata.com/service-proxy/
ProxyPass /service-proxy/ http://sp-mkc.indexdata.com/service-proxy/
ProxyPassReverse /service-proxy/ http://sp-mkc.indexdata.com/service-proxy/