From: Tomas Doran <bobtfish@bobtfish.net>
Date: Mon, 12 Apr 2010 19:16:39 +0000 (+0000)
Subject: Fix dsadinoff's mod_rewrite bug I hope
X-Git-Tag: 5.80023~22
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=46b58c90d2cae855b523a375d56f874fd28665d3

Fix dsadinoff's mod_rewrite bug I hope
---

diff --git a/Changes b/Changes
index bdcf533..b8ed095 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,10 @@
 # This file documents the revision history for Perl extension Catalyst.
 
+  Bug fixes:
+   - Additional fix for getting the base application path right when rewriting
+     requests into an application sub path with mod_alias and mod_rewrite on
+     Apache.
+
   New features:
    - Setting __PACKAGE__->config(enable_catalyst_header => 1); in your MyApp.pm
      now enables the X-Catalyst header being printed when not in debug mode.
diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index dab2c8f..3d98994 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -95,6 +95,7 @@ sub import {
         my @superclasses = ($meta->superclasses, $class, 'Catalyst::Controller');
         $meta->superclasses(@superclasses);
     }
+    $meta->make_mutable if $meta->is_immutable; # HACK
     # Avoid possible C3 issues if 'Moose::Object' is already on RHS of MyApp
     $meta->superclasses(grep { $_ ne 'Moose::Object' } $meta->superclasses);
 
diff --git a/lib/Catalyst/Engine/CGI.pm b/lib/Catalyst/Engine/CGI.pm
index 4c0d9b9..de9fe2d 100644
--- a/lib/Catalyst/Engine/CGI.pm
+++ b/lib/Catalyst/Engine/CGI.pm
@@ -128,6 +128,7 @@ sub prepare_path {
     else {
         $base_path = $script_name || '/';
     }
+#    $base_path .= '/' unless $base_path =~ m{/$};
 
     # If we are running as a backend proxy, get the true hostname
   PROXY_CHECK:
@@ -157,20 +158,15 @@ sub prepare_path {
     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 ($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|^(.*?\Q$match\E)|;
-                substr($req_uri, 0, length($match), $path_info_part)
-                    if $path_info_part;
-            }
+            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;
         }
     }
diff --git a/t/aggregate/unit_core_engine_cgi-prepare_path.t b/t/aggregate/unit_core_engine_cgi-prepare_path.t
index 76bad62..39281cd 100644
--- a/t/aggregate/unit_core_engine_cgi-prepare_path.t
+++ b/t/aggregate/unit_core_engine_cgi-prepare_path.t
@@ -86,7 +86,16 @@ use Catalyst::Engine::CGI;
     is ''.$r->base, 'http://www.foo.com/oslobilder/';
 }
 
-
+{
+    my $r = get_req (
+        PATH_INFO => '/auth/login',
+        SCRIPT_NAME => '/tx',
+        REQUEST_URI => '/login',
+    );
+    is ''.$r->path, 'auth/login';
+    is ''.$r->uri, 'http://www.foo.com/tx/auth/login';
+    is ''.$r->base, 'http://www.foo.com/tx/';
+}
 
 
 # FIXME - Test proxy logic