X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lib%2FCGI%2FMaypole.pm;h=5fd736d3e25681cd240c61d2d233252e46e0c613;hb=0ce03c9aa8e988d951a1383c99287d5ca4fbdfba;hp=4724a1b532d64625de4bcd3b8ba8c8759a2de731;hpb=6cd7a25572c93242146d8d8ce0eb3f2bbb76917e;p=maypole.git diff --git a/lib/CGI/Maypole.pm b/lib/CGI/Maypole.pm index 4724a1b..5fd736d 100644 --- a/lib/CGI/Maypole.pm +++ b/lib/CGI/Maypole.pm @@ -92,12 +92,18 @@ sub parse_location $r->headers_in->set($field_name => $cgi->http($http_header)); } + $self->preprocess_location(); + my $path = $cgi->url( -absolute => 1, -path_info => 1 ); my $loc = $cgi->url( -absolute => 1 ); { no warnings 'uninitialized'; $path .= '/' if $path eq $loc; - $path =~ s/^($loc)?\///; + if ($loc =~ /\/$/) { + $path =~ s/^($loc)?//; + } else { + $path =~ s/^($loc)?\///; + } } $r->path($path);