Merge 'trunk' into 'fix_request_uri'

r13213@tomas-dorans-macbook-pro (orig r13177):  ajgb | 2010-04-21 11:10:51 +0000
Fix not stripping backslashes in DispatchType::Regex::uri_for_action
r15483@tomas-dorans-macbook-pro (orig r13190):  rafl | 2010-04-28 22:54:04 +0000
Make sure path_to returns an instance of the right Path::Class class.
r15484@tomas-dorans-macbook-pro (orig r13191):  edenc | 2010-04-28 23:29:02 +0000
minor documentation fix for handle_request
r15489@tomas-dorans-macbook-pro (orig r13193):  rafl | 2010-05-02 23:16:25 +0000
Allow parameterized roles to be applied as plugins.
r15490@tomas-dorans-macbook-pro (orig r13194):  t0m | 2010-05-02 23:27:43 +0000
Back out crazy heuristics

diff --cc lib/Catalyst/Engine/CGI.pm
index 318240d,331d814..a8a2b1b
--- 1/lib/Catalyst/Engine/CGI.pm
--- 2/lib/Catalyst/Engine/CGI.pm
+++ b/lib/Catalyst/Engine/CGI.pm
@@@ -154,22 -154,24 +154,26 @@@ 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..
 -            # 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;
 +    if ($c->config->{rfc3875_paths}) {
 +        if (my $req_uri = $ENV{REQUEST_URI}) {
 +            $req_uri =~ s/^\Q$base_path\E//;
 +            $req_uri =~ s/\?.*$//;
-             if ($req_uri && $req_uri ne '/') {
++            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..
 +                # 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.
-                 # FIXME - This stuff is shit, we should get REDIRECT_URI, right?
-                 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;
++                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;
++                }
 +                $path_info = $req_uri;
              }
 -            $path_info = $req_uri;
          }
      }
  

diff --cc t/aggregate/unit_core_engine_cgi-prepare_path.t
Simple merge