From: Tomas Doran Date: Sat, 9 Jan 2010 15:57:27 +0000 (+0000) Subject: Back out r12493, use \Q instead X-Git-Tag: 5.80017~7 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=bb55391fcb8b0bac4e35ae0ed9a2425cccf234fc Back out r12493, use \Q instead --- diff --git a/lib/Catalyst/Engine/CGI.pm b/lib/Catalyst/Engine/CGI.pm index cabd343..fc2d02a 100644 --- 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;