From cd0bb344d704484eb4ef3d034249edf0d904326a Mon Sep 17 00:00:00 2001 From: Jephte CLAIN Date: Mon, 18 Aug 2014 17:13:53 +0400 Subject: [PATCH] =?UTF-8?q?bug=20avec=20la=20g=C3=A9n=C3=A9ration=20des=20?= =?UTF-8?q?proxy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/ulib/.ulibver | 2 +- mkRewriteRules | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/ulib/.ulibver b/lib/ulib/.ulibver index 61eeac8..ce6de83 100644 --- a/lib/ulib/.ulibver +++ b/lib/ulib/.ulibver @@ -1 +1 @@ -001001000 +001001001 diff --git a/mkRewriteRules b/mkRewriteRules index 9205455..727f797 100755 --- a/mkRewriteRules +++ b/mkRewriteRules @@ -207,25 +207,25 @@ for rule in "${rules[@]}"; do if [ -n "$noslash" ]; then echo "${prefix}RewriteRule ^/$src${trail:+(.*)} $(joinurl "$prot://$host/cgi-bin/WebObjects" "$dest" "$suffix" ${trail:+\$1}) [L${options:+,$options}]" >>"$outfile" setx url joinurl "http://$thishost" "$usrc" - setx proxy_url joinurl "prot://$host/cgi-bin/WebObjects" "$dest" "$suffix" + setx proxy_url joinurl "$prot://$host/cgi-bin/WebObjects" "$dest" "$suffix" else echo "${prefix}RewriteRule ^/$src\$ /$src/" >>"$outfile" echo "${prefix}RewriteRule ^/$src/(.*) $(joinurl "$prot://$host/cgi-bin/WebObjects" "$dest" "$suffix" "\$1") [L${options:+,$options}]" >>"$outfile" setx url joinurl "http://$thishost" "$usrc/" - setx proxy_url joinurl "prot://$host/cgi-bin/WebObjects" "$dest" "$suffix/" + setx proxy_url joinurl "$prot://$host/cgi-bin/WebObjects" "$dest" "$suffix/" fi else # sur le même hôte if [ -n "$noslash" ]; then echo "${prefix}RewriteRule ^/$src${trail:+(.*)} $(joinurl /cgi-bin/WebObjects "$dest" "$suffix" ${trail:+\$1}) [L,P${options:+,$options}]" >>"$outfile" setx url joinurl "http://$thishost" "$usrc" - setx proxy_url joinurl "prot://$thishost/cgi-bin/WebObjects" "$dest" "$suffix" + setx proxy_url joinurl "$prot://$thishost/cgi-bin/WebObjects" "$dest" "$suffix" proxy_use=1 else echo "${prefix}RewriteRule ^/$src\$ /$src/" >>"$outfile" echo "${prefix}RewriteRule ^/$src/(.*) $(joinurl /cgi-bin/WebObjects "$dest" "$suffix" "\$1") [L,P${options:+,$options}]" >>"$outfile" setx url joinurl "http://$thishost" "$usrc/" - setx proxy_url joinurl "prot://$thishost/cgi-bin/WebObjects" "$dest" "$suffix/" + setx proxy_url joinurl "$prot://$thishost/cgi-bin/WebObjects" "$dest" "$suffix/" proxy_use=1 fi fi @@ -236,7 +236,7 @@ for rule in "${rules[@]}"; do if [ -n "$noslash" ]; then echo "${prefix}RewriteRule ^/$src${trail:+(.*)} $(joinurl "$prot://$host" "$dest" "$suffix" ${trail:+\$1}) [L${options:+,$options}]" >>"$outfile" setx url joinurl "http://$thishost" "$usrc" - setx proxy_url joinurl "prot://$host" "$dest" "$suffix" + setx proxy_url joinurl "$prot://$host" "$dest" "$suffix" else echo "${prefix}RewriteRule ^/$src\$ /$src/" >>"$outfile" echo "${prefix}RewriteRule ^/$src/(.*) $(joinurl "$prot://$host" "$dest" "$suffix" "\$1") [L${options:+,$options}]" >>"$outfile"