localize placeholder values and merge early again

mojolicious · Aug 11, 2014 · 175cc94 · 175cc94
1 parent f5b6b08
commit 175cc94
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/lib/Mojolicious/Routes/Match.pm b/lib/Mojolicious/Routes/Match.pm
@@ -44,6 +44,8 @@ sub _match {
   my $detect  = (my $endpoint = $r->is_endpoint) && !$partial;
   return unless my $captures = $r->pattern->match_partial(\$path, $detect);
   local $options->{path} = $path;
+  local @{$self->{captures} ||= {}}{keys %$captures} = values %$captures;
+  $captures = $self->{captures};
 
   # Method
   my $methods = $r->via;
@@ -61,10 +63,6 @@ sub _match {
   # WebSocket
   return if $r->is_websocket && !$options->{websocket};
 
-  # Merge after everything matched
-  @{$self->{captures} ||= {}}{keys %$captures} = values %$captures;
-  $captures = $self->{captures};
-
   # Partial
   my $empty = !length $path || $path eq '/';
   if ($partial) {