updated changelog, fixed mistake in CGI::Maypole

[maypole.git] / lib / CGI / Maypole.pm

diff --git a/lib/CGI/Maypole.pm b/lib/CGI/Maypole.pm
index d223c768c335b20e85d10af609fd0c271498c339..dda15fcd7a52df6c8dabd3616b4bb22223d1e77a 100644 (file)
--- 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));
     }
 
+    $r->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);
     
@@ -105,6 +111,10 @@ sub parse_location
     $r->parse_args;
 }
 
+=item warn
+
+=cut
+
 sub warn {
     my ($self,@args) = @_;
     my ($package, $line) = (caller)[0,2];