Merge branch 'hotfix/3355'

Close zendframework#3355 Fixes zendframework#2511
jpfaria · Jan 7, 2013 · 683765e · 683765e
2 parents b46b073 + ebbb0bd
commit 683765e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/library/Zend/Mvc/Router/Http/Literal.php b/library/Zend/Mvc/Router/Http/Literal.php
@@ -95,7 +95,7 @@ public function match(Request $request, $pathOffset = null)
         $path = $uri->getPath();
 
         if ($pathOffset !== null) {
-            if ($pathOffset >= 0 && strlen($path) >= $pathOffset) {
+            if ($pathOffset >= 0 && strlen($path) >= $pathOffset && !empty($this->route)) {
                 if (strpos($path, $this->route, $pathOffset) === $pathOffset) {
                     return new RouteMatch($this->defaults, strlen($this->route));
                 }

diff --git a/tests/ZendTest/Mvc/Router/Http/LiteralTest.php b/tests/ZendTest/Mvc/Router/Http/LiteralTest.php
@@ -130,4 +130,14 @@ public function testFactory()
             )
         );
     }
+
+    /**
+     * @group ZF2-436
+     */
+    public function testEmptyLiteral()
+    {
+        $request = new Request();
+        $route = new Literal('');
+        $this->assertNull($route->match($request, 0));
+    }
 }