[Catalyst-commits] r12555 - Catalyst-Runtime/5.80/trunk/lib/Catalyst/Engine

[t0m at dev.catalyst.perl.org]

Author: t0m
Date: 2010-01-09 15:57:27 +0000 (Sat, 09 Jan 2010)
New Revision: 12555

Modified:
   Catalyst-Runtime/5.80/trunk/lib/Catalyst/Engine/CGI.pm
Log:
Back out r12493, use \Q instead

Modified: Catalyst-Runtime/5.80/trunk/lib/Catalyst/Engine/CGI.pm
===================================================================
--- Catalyst-Runtime/5.80/trunk/lib/Catalyst/Engine/CGI.pm	2010-01-09 15:37:00 UTC (rev 12554)
+++ Catalyst-Runtime/5.80/trunk/lib/Catalyst/Engine/CGI.pm	2010-01-09 15:57:27 UTC (rev 12555)
@@ -167,8 +167,7 @@
             # 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;