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

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

diff --git a/t/aggregate/unit_core_engine-prepare_path.t b/t/aggregate/unit_core_engine-prepare_path.t
index 1fa9750..a7cad81 100644 (file)
--- a/t/aggregate/unit_core_engine-prepare_path.t
+++ b/t/aggregate/unit_core_engine-prepare_path.t
@@ -9,6 +9,7 @@ use Catalyst::Engine;
 # mod_rewrite to app root for non / based app
 {
     my $r = get_req (0,
+        REDIRECT_URL => '/comics/',
         SCRIPT_NAME => '/comics/dispatch.cgi',
         REQUEST_URI => '/comics/',
     );
@@ -20,6 +21,7 @@ use Catalyst::Engine;
 {
     my $r = get_req (0,
         PATH_INFO  => '/foo/bar.gif',
+        REDIRECT_URL => '/comics/foo/bar.gif',
         SCRIPT_NAME => '/comics/dispatch.cgi',
         REQUEST_URI => '/comics/foo/bar.gif',
     );