Back out r12493, use \Q instead

diff --git a/lib/Catalyst/Engine/CGI.pm b/lib/Catalyst/Engine/CGI.pm
index cabd343..fc2d02a 100644 (file)
--- a/lib/Catalyst/Engine/CGI.pm
+++ b/lib/Catalyst/Engine/CGI.pm
@@ -167,8 +167,7 @@ sub prepare_path {
             # incorrect.
             if (substr($req_uri, 0, 1) ne '/') {
                 my ($match) = $req_uri =~ m|^([^/]+)|;
-                my $idx = index($path_info, $match) + length($match);
-                my $path_info_part = substr($path_info, 0, $idx);
+                my ($path_info_part) = $path_info =~ m|^(.*?\Q$match)|;
                 substr($req_uri, 0, length($match), $path_info_part);
             }
             $path_info = $req_uri;