modules
/
nutools
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bug avec la génération des proxy

This commit is contained in:
Jephté Clain 2014-08-18 17:13:53 +04:00
parent 4e12a7c8a5
commit cd0bb344d7
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ulib/.ulibver
View File

@ -1 +1 @@
001001000 001001001

10
mkRewriteRules
View File

@ -207,25 +207,25 @@ for rule in "${rules[@]}"; do
if [ -n "$noslash" ]; then if [ -n "$noslash" ]; then
echo "${prefix}RewriteRule ^/$src${trail:+(.*)} $(joinurl "$prot://$host/cgi-bin/WebObjects" "$dest" "$suffix" ${trail:+\$1}) [L${options:+,$options}]" >>"$outfile" 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 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 else
echo "${prefix}RewriteRule ^/$src\$ /$src/" >>"$outfile" echo "${prefix}RewriteRule ^/$src\$ /$src/" >>"$outfile"
echo "${prefix}RewriteRule ^/$src/(.*) $(joinurl "$prot://$host/cgi-bin/WebObjects" "$dest" "$suffix" "\$1") [L${options:+,$options}]" >>"$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 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 fi
else else
# sur le même hôte # sur le même hôte
if [ -n "$noslash" ]; then if [ -n "$noslash" ]; then
echo "${prefix}RewriteRule ^/$src${trail:+(.*)} $(joinurl /cgi-bin/WebObjects "$dest" "$suffix" ${trail:+\$1}) [L,P${options:+,$options}]" >>"$outfile" 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 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 proxy_use=1
else else
echo "${prefix}RewriteRule ^/$src\$ /$src/" >>"$outfile" echo "${prefix}RewriteRule ^/$src\$ /$src/" >>"$outfile"
echo "${prefix}RewriteRule ^/$src/(.*) $(joinurl /cgi-bin/WebObjects "$dest" "$suffix" "\$1") [L,P${options:+,$options}]" >>"$outfile" echo "${prefix}RewriteRule ^/$src/(.*) $(joinurl /cgi-bin/WebObjects "$dest" "$suffix" "\$1") [L,P${options:+,$options}]" >>"$outfile"
setx url joinurl "http://$thishost" "$usrc/" 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 proxy_use=1
fi fi
fi fi
@ -236,7 +236,7 @@ for rule in "${rules[@]}"; do
if [ -n "$noslash" ]; then if [ -n "$noslash" ]; then
echo "${prefix}RewriteRule ^/$src${trail:+(.*)} $(joinurl "$prot://$host" "$dest" "$suffix" ${trail:+\$1}) [L${options:+,$options}]" >>"$outfile" echo "${prefix}RewriteRule ^/$src${trail:+(.*)} $(joinurl "$prot://$host" "$dest" "$suffix" ${trail:+\$1}) [L${options:+,$options}]" >>"$outfile"
setx url joinurl "http://$thishost" "$usrc" setx url joinurl "http://$thishost" "$usrc"
setx proxy_url joinurl "prot://$host" "$dest" "$suffix" setx proxy_url joinurl "$prot://$host" "$dest" "$suffix"
else else
echo "${prefix}RewriteRule ^/$src\$ /$src/" >>"$outfile" echo "${prefix}RewriteRule ^/$src\$ /$src/" >>"$outfile"
echo "${prefix}RewriteRule ^/$src/(.*) $(joinurl "$prot://$host" "$dest" "$suffix" "\$1") [L${options:+,$options}]" >>"$outfile" echo "${prefix}RewriteRule ^/$src/(.*) $(joinurl "$prot://$host" "$dest" "$suffix" "\$1") [L${options:+,$options}]" >>"$outfile"