optimize routing

laravel · Dec 3, 2016 · c8ed0c3 · c8ed0c3
1 parent dd29c00
commit c8ed0c3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/Illuminate/Routing/Matching/UriValidator.php b/src/Illuminate/Routing/Matching/UriValidator.php
@@ -18,6 +18,11 @@ public function matches(Route $route, Request $request)
     {
         $path = $request->path() == '/' ? '/' : '/'.$request->path();
 
+        if ('' !== $route->getCompiled()->getStaticPrefix() &&
+            0 !== strpos($path, $route->getCompiled()->getStaticPrefix())) {
+            return false;
+        }
+
         return preg_match($route->getCompiled()->getRegex(), rawurldecode($path));
     }
 }
diff --git a/src/Illuminate/Routing/Route.php b/src/Illuminate/Routing/Route.php
@@ -247,6 +247,10 @@ public function matches(Request $request, $includingMethod = true)
      */
     protected function compileRoute()
     {
+        if ($this->compiled) {
+            return;
+        }
+
         $optionals = $this->extractOptionalParameters();
 
         $uri = preg_replace('/\{(\w+?)\?\}/', '{$1}', $this->uri);
@@ -995,7 +999,9 @@ public function prepareForSerialization()
             throw new LogicException("Unable to prepare route [{$this->uri}] for serialization. Uses Closure.");
         }
 
-        unset($this->router, $this->container, $this->compiled);
+        $this->compileRoute();
+
+        unset($this->router, $this->container);
     }
 
     /**