q/thirdculture-werc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Some redirect improvements (add the domain name to match string)

Browse source
This commit is contained in:
Uriel 2008-07-12 07:34:43 +02:00
parent f69578a99c
commit cc6f787322
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
bin/controller.rc
View file

@ -152,7 +152,7 @@ fn dprint {
} }
if(! ~ $#debug 0) if(! ~ $#debug 0)
dprint $SERVER_NAME^'/'^$REQUEST_URI^' - '^$"HTTP_USER_AGENT dprint $SERVER_NAME^$REQUEST_URI^' - '^$"HTTP_USER_AGENT
if (! ~ $args '') { if (! ~ $args '') {
@ -190,10 +190,10 @@ Location: '^$1^'
if (~ $#redirectPermanent 1) if (~ $#redirectPermanent 1)
perm_redirect $"redirectPermanent perm_redirect $"redirectPermanent
if not if (~ $#redirectPermanent 2) { if not if (~ $#redirectPermanent 2 && {echo $SERVER_NAME^$REQUEST_URI|grep -s $redirectPermanent(1) }) {
# Experimental regexp sub-based redirect, probably should find a nicer interface # Experimental regexp sub-based redirect, probably should find a nicer interface
# For now only used at sites/harmful.cat-v.org/software/OO_programming/_config # For now only used at sites/harmful.cat-v.org/software/OO_programming/_config
to=`{echo $REQUEST_URI|sed 's|'^$redirectPermanent(1)^'|'^$redirectPermanent(2)^'|'} to=`{echo $SERVER_NAME^$REQUEST_URI|sed 's|'^$redirectPermanent(1)^'|'^$redirectPermanent(2)^'|'}
if(! ~ $to $REQUEST_URI) if(! ~ $to $REQUEST_URI)
perm_redirect $to perm_redirect $to
} }