Preparation for the deprecation of http.ServerResponse.finished

engine.js

@@ -77,7 +77,7 @@ function middie (complete) {
 
       req.url = req.originalUrl
 
-      if (res.finished === true) {
+      if (res.finished === true || res.writableEnded === true) {
         that.req = null
         that.res = null
         that.context = null

test/engine.test.js

@@ -467,7 +467,7 @@ test('should match the same slashed path', t => {
   instance.run(req, res)
 })
 
-test('if the function calls res.end the iterator should stop', t => {
+test('if the function calls res.end the iterator should stop / 1 (with deprecated finished flag)', t => {
   t.plan(1)
 
   const instance = middie(function () {
@@ -495,3 +495,25 @@ test('if the function calls res.end the iterator should stop', t => {
 
   instance.run(req, res)
 })
+
+test('if the function calls res.end the iterator should stop / 2', t => {
+  t.plan(0)
+
+  const instance = middie(function () {
+    t.fail('we should not be here')
+  })
+  const req = new http.IncomingMessage(null)
+  req.url = '/test'
+  const res = new http.ServerResponse(req)
+
+  instance
+    .use(function (req, res, next) {
+      res.end('bye')
+      next()
+    })
+    .use(function (req, res, next) {
+      t.fail('we should not be here')
+    })
+
+  instance.run(req, res)
+})