[Catalyst-commits] r6380 - trunk/Catalyst-Engine-Apache/lib/Catalyst/Engine

[andyg at dev.catalyst.perl.org]

Author: andyg
Date: 2007-05-08 23:32:56 +0100 (Tue, 08 May 2007)
New Revision: 6380

Modified:
   trunk/Catalyst-Engine-Apache/lib/Catalyst/Engine/Apache.pm
Log:
Apache: Expand the LocationMatch check to allow all valid URI characters

Modified: trunk/Catalyst-Engine-Apache/lib/Catalyst/Engine/Apache.pm
===================================================================
--- trunk/Catalyst-Engine-Apache/lib/Catalyst/Engine/Apache.pm	2007-05-08 19:21:29 UTC (rev 6379)
+++ trunk/Catalyst-Engine-Apache/lib/Catalyst/Engine/Apache.pm	2007-05-08 22:32:56 UTC (rev 6380)
@@ -132,9 +132,9 @@
         ($path, $qs)            = split /\?/, $path_query, 2;
     }
     
-    # Check if $base_path appears to be a regex,
+    # Check if $base_path appears to be a regex (contains invalid characters),
     # meaning we're in a LocationMatch block
-    if ( $base_path =~ m{[^A-Za-z/]} ) {
+    if ( $base_path =~ m/[^$URI::uric]/o ) {
         # Find out what part of the URI path matches the LocationMatch regex,
         # that will become our base
         my $match = qr/($base_path)/;