Add in the REDIRECT_URL handling from trunk and the values for the tests

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

diff --git a/lib/Catalyst/Engine.pm b/lib/Catalyst/Engine.pm
index 17ec97b..29a2188 100644 (file)
--- a/lib/Catalyst/Engine.pm
+++ b/lib/Catalyst/Engine.pm
@@ -525,7 +525,12 @@ sub prepare_path {
     # set the request URI
     my $path;
     if (!$ctx->config->{use_request_uri_for_path}) {
-        $path = $base_path . $env->{PATH_INFO};
+        my $path_info = $env->{PATH_INFO};
+        if ( exists $env->{REDIRECT_URL} ) {
+            $base_path = $env->{REDIRECT_URL};
+            $base_path =~ s/\Q$path_info\E$//;
+        }
+        $path = $base_path . $path_info;
         $path =~ s{^/+}{};
         $path =~ s/([^$URI::uric])/$URI::Escape::escapes{$1}/go;
         $path =~ s/\?/%3F/g; # STUPID STUPID SPECIAL CASE