Fixed a bug where URLMap for / gets 404 when a pattern match happenes

plack · Nov 26, 2009 · 0eab4e2 · 0eab4e2
1 parent bf711b5
commit 0eab4e2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/lib/Plack/App/URLMap.pm b/lib/Plack/App/URLMap.pm
@@ -50,7 +50,7 @@ sub to_app {
             next unless not defined $host     or
                         $http_host   eq $host or
                         $server_name eq $host;
-            next unless $path =~ s!\Q$location\E!!;
+            next unless $location eq '' or $path =~ s!\Q$location\E!!;
             next unless $path eq '' or $path =~ m!/!;
 
             local $env->{PATH_INFO}  = $path;

diff --git a/t/Plack-Middleware/urlmap.t b/t/Plack-Middleware/urlmap.t
@@ -52,6 +52,12 @@ test_psgi app => $app, client => sub {
 
     $res = $cb->(GET "http://bar.example.com/foo");
     is $res->content, 'app4||/foo';
+
+    # Fix a bug where $location eq ''
+    $_ = "bar"; /bar/;
+    $res = $cb->(GET "http://localhost/");
+    is $res->content, 'app1||/';
+
 };
 
 done_testing;