Get it mostly working, except uri_for is still buggered

[catagits/Catalyst-Runtime.git] / lib / Catalyst / Engine / CGI.pm

diff --git a/lib/Catalyst/Engine/CGI.pm b/lib/Catalyst/Engine/CGI.pm
index 9df1444..3f2ef67 100644 (file)
--- a/lib/Catalyst/Engine/CGI.pm
+++ b/lib/Catalyst/Engine/CGI.pm
@@ -123,7 +123,7 @@ sub prepare_path {
     my $base_path;
     if ( exists $ENV{REDIRECT_URL} ) {
         $base_path = $ENV{REDIRECT_URL};
-        $base_path =~ s/$ENV{PATH_INFO}$//;
+        $base_path =~ s/\Q$ENV{PATH_INFO}\E$//;
     }
     else {
         $base_path = $script_name || '/';
@@ -154,29 +154,27 @@ sub prepare_path {
     # See https://issues.apache.org/bugzilla/show_bug.cgi?id=35256
     # Here we try to resurrect the original encoded URI from REQUEST_URI.
     my $path_info   = $ENV{PATH_INFO};
-    if (my $req_uri = $ENV{REQUEST_URI}) {
-        $req_uri =~ s/^\Q$base_path\E//;
-        $req_uri =~ s/\?.*$//;
-        if ($req_uri) {
-            # Note that if REQUEST_URI doesn't start with a /, then the user
-            # is probably using mod_rewrite or something to rewrite requests
-            # into a sub-path of their application..
+#    if (my $req_uri = $ENV{REQUEST_URI}) {
+#        $req_uri =~ s/^\Q$base_path\E//;
+#        $req_uri =~ s/\?.*$//;
+#        if ($req_uri && $req_uri ne '/') {
             # This means that REQUEST_URI needs information from PATH_INFO
             # prepending to it to be useful, otherwise the sub path which is
             # being redirected to becomes the app base address which is
             # incorrect.
-            if (substr($req_uri, 0, 1) ne '/') {
-                my ($match) = $req_uri =~ m|^([^/]+)|;
-                my ($path_info_part) = $path_info =~ m|^(.*?$match)|;
-                substr($req_uri, 0, length($match), $path_info_part);
-            }
-            $path_info = $req_uri;
-        }
-    }
-
+#            my ($match) = $req_uri =~ m{^(/?[^/]+)};
+#            my ($path_info_part) = $path_info =~ m|^(.*?\Q$match\E)|;
+#            substr($req_uri, 0, length($match), $path_info_part)
+#                if $path_info_part;
+#            $path_info = $req_uri;
+#        }
+#    }
+    $path_info =~ s/%2F/%252F/g;
     # set the request URI
+    warn("Base path $base_path, path_info $path_info");
     my $path = $base_path . ( $path_info || '' );
     $path =~ s{^/+}{};
+    $base_path .= '/' unless $base_path =~ m{/$};
 
     # Using URI directly is way too slow, so we construct the URLs manually
     my $uri_class = "URI::$scheme";
@@ -195,7 +193,7 @@ sub prepare_path {
     my $query = $ENV{QUERY_STRING} ? '?' . $ENV{QUERY_STRING} : '';
     my $uri   = $scheme . '://' . $host . '/' . $path . $query;
 
-    $c->request->uri( bless \$uri, $uri_class );
+    $c->request->uri( bless(\$uri, $uri_class)->canonical );
 
     # set the base URI
     # base must end in a slash