Revert "Do not double send the response if the request is destroyed b…

…ut not aborted (#4963)"

This reverts commit c235d2d.

lib/wrapThenable.js

@@ -18,10 +18,7 @@ function wrapThenable (thenable, reply) {
     // the request may be terminated during the reply. in this situation,
     // it require an extra checking of request.aborted to see whether
     // the request is killed by client.
-    // Most of the times aborted will be true when destroyed is true,
-    // however there is a race condition where the request is not
-    // aborted but only destroyed.
-    if (payload !== undefined || (reply.sent === false && reply.raw.headersSent === false && reply.request.raw.aborted === false && reply.request.raw.destroyed === false)) {
+    if (payload !== undefined || (reply.sent === false && reply.raw.headersSent === false && reply.request.raw.aborted === false)) {
       // we use a try-catch internally to avoid adding a catch to another
       // promise, increase promise perf by 10%
       try {

test/wrapThenable.test.js

@@ -27,25 +27,3 @@ test('should reject immediately when reply[kReplyHijacked] is true', t => {
   const thenable = Promise.reject(new Error('Reply sent already'))
   wrapThenable(thenable, reply)
 })
-
-test('should not send the payload if the raw socket was destroyed but not aborted', async t => {
-  const reply = {
-    sent: false,
-    raw: {
-      headersSent: false
-    },
-    request: {
-      raw: {
-        aborted: false,
-        destroyed: true
-      }
-    },
-    send () {
-      t.fail('should not send')
-    }
-  }
-  const thenable = Promise.resolve()
-  wrapThenable(thenable, reply)
-
-  await thenable
-})