Merge 724152c into e04c217

pillarjs · Nov 13, 2015 · d1cb653 · d1cb653
2 parents e04c217 + 724152c
commit d1cb653
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/index.js b/index.js
@@ -189,7 +189,7 @@ Router.prototype.handle = function handle(req, res, callback) {
   next()
 
   function next(err) {
-    var layerError = err === 'route'
+    var layerError = err === 'route' || err === 'router'
       ? null
       : err
 
@@ -207,7 +207,7 @@ Router.prototype.handle = function handle(req, res, callback) {
     }
 
     // no more matching layers
-    if (idx >= stack.length) {
+    if (err === 'router' || idx >= stack.length) {
       defer(done, layerError)
       return
     }

diff --git a/test/router.js b/test/router.js
@@ -459,6 +459,21 @@ describe('Router', function () {
       .expect(200, 'saw POST /foo', cb)
     })
 
+    it('should exit the router', function (done) {
+      var router = new Router()
+      var server = createServer(router)
+
+      router.use(function (req, res, next) {
+        next('router')
+      })
+
+      router.use(helloWorld)
+
+      request(server)
+      .get('/')
+      .expect(404, done)
+    })
+
     it('should not invoke for blank URLs', function (done) {
       var router = new Router()
       var server = createServer(function hander(req, res, next) {