fix index: false bug if path is directory

fix `index: false` bug if path is directory Revert "fix `index: false` bug if path is directory" This reverts commit b952196. fix `index: false` bug if path is directory closes #104
koajs · Jul 9, 2017 · 1328f78 · 1328f78
1 parent d2b6dbb
commit 1328f78
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/index.js b/index.js
@@ -37,16 +37,18 @@ function serve (root, opts) {
 
   if (!opts.defer) {
     return async function serve (ctx, next) {
+      let done = false
+
       if (ctx.method === 'HEAD' || ctx.method === 'GET') {
         try {
-          await send(ctx, ctx.path, opts)
+          done = await send(ctx, ctx.path, opts)
         } catch (err) {
-          await next()
         }
-        return
       }
 
-      await next()
+      if (!done) {
+        await next()
+      }
     }
   }
 

diff --git a/test/index.js b/test/index.js
@@ -132,6 +132,19 @@ describe('serve(root)', function () {
             .get('/world/')
             .expect(404, done)
         })
+
+        it('should pass to downstream if 404', function (done) {
+          const app = new Koa()
+
+          app.use(serve('test/fixtures', { index: false }))
+          app.use(async (ctx) => {
+            ctx.body = 'oh no'
+          })
+
+          request(app.listen())
+            .get('/world/')
+            .expect('oh no', done)
+        })
       })
     })