Ensure routing failure leads to early request completion

- Do not clone the event when triggering dispatch.error after routing failure

library/Zend/Mvc/Application.php

@@ -288,10 +288,9 @@ public function route(MvcEvent $e)
         $routeMatch = $router->match($request);
 
         if (!$routeMatch instanceof Router\RouteMatch) {
-            $error = clone $e;
-            $error->setError(static::ERROR_CONTROLLER_NOT_FOUND);
+            $e->setError(static::ERROR_CONTROLLER_NOT_FOUND);
 
-            $results = $this->events()->trigger('dispatch.error', $error);
+            $results = $this->events()->trigger('dispatch.error', $e);
             if (count($results)) {
                 $return  = $results->last();
             } else {
@@ -319,10 +318,9 @@ public function dispatch(MvcEvent $e)
             );
         }
 
-        $events     = $this->events();
-        $routeMatch = $e->getRouteMatch();
-
+        $routeMatch     = $e->getRouteMatch();
         $controllerName = $routeMatch->getParam('controller', 'not-found');
+        $events         = $this->events();
 
         try {
             $controller = $locator->get($controllerName);

tests/Zend/Mvc/ApplicationTest.php

@@ -566,4 +566,26 @@ public function testLocatorExceptionShouldTriggerDispatchError()
         $result = $app->run();
         $this->assertSame($response, $result);
     }
+
+    /**
+     * @group error-handling
+     */
+    public function testFailureForRouteToReturnRouteMatchShouldPopulateEventError()
+    {
+        $app    = $this->setupBadController();
+        $router = new Router\SimpleRouteStack();
+        $app->setRouter($router);
+
+        $response = $app->getResponse();
+        $events   = $app->events();
+        $events->attach('dispatch.error', function ($e) use ($response) {
+            $error      = $e->getError();
+            $response->setContent("Code: " . $error);
+            return $response;
+        });
+
+        $app->run();
+        $event = $app->getMvcEvent();
+        $this->assertEquals(Application::ERROR_CONTROLLER_NOT_FOUND, $event->getError());
+    }
 }