--- ../../work/CGI.pm-3.20/CGI.pm	2006-04-24 00:25:14.000000000 +1000
+++ CGI.pm	2006-08-09 10:46:17.390625000 +1000
@@ -2641,6 +2641,7 @@
 
     my $rewrite_in_use = $request_uri && $request_uri !~ /^$script_name/;
     undef $path if $rewrite_in_use && $rewrite;  # path not valid when rewriting active
+    undef $path if ($path eq $script_name);
 
     my $uri         =  $rewrite && $request_uri ? $request_uri : $script_name;
     $uri            =~ s/\?.*$//;                                 # remove query string
@@ -2777,8 +2778,10 @@
    my $raw_path_info   = $ENV{PATH_INFO}   || '';
    my $uri             = unescape($self->request_uri) || '';
 
+   if ($raw_path_info ne $raw_script_name) {
    my $protected    = quotemeta($raw_path_info);
    $raw_script_name =~ s/$protected$//;
+   }
 
    my @uri_double_slashes  = $uri =~ m^(/{2,}?)^g;
    my @path_double_slashes = "$raw_script_name $raw_path_info" =~ m^(/{2,}?)^g;