Revert "http: set IncomingMessage.destroyed"

This reverts commit 28e6626.
PR-URL: #33686
Backport-PR-URL: #33686
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Juan José Arboleda <soyjuanarbol@gmail.com>

Author: ronag

lib/_http_client.js

@@ -426,12 +426,10 @@ function socketCloseListener() {
 req.emit('close');
 if(!res.aborted&&res.readable){
 res.on('end',function(){
-this.destroyed=true;
 this.emit('close');
 });
 res.push(null);
 }else{
-res.destroyed=true;
 res.emit('close');
 }
 }else{
@@ -545,7 +543,6 @@ function socketOnData(d) {
 socket.readableFlowing=null;
 
 req.emit(eventName,res,socket,bodyHead);
-req.destroyed=true;
 req.emit('close');
 }else{
 // Requested Upgrade or used CONNECT method, but have no handler.

lib/_http_incoming.js

@@ -119,8 +119,6 @@ IncomingMessage.prototype._read = function _read(n) {
 // any messages, before ever calling this. In that case, just skip
 // it, since something else is destroying this connection anyway.
 IncomingMessage.prototype.destroy=functiondestroy(error){
-// TODO(ronag): Implement in terms of _destroy
-this.destroyed=true;
 if(this.socket)
 this.socket.destroy(error);
 returnthis;

lib/_http_server.js

@@ -205,10 +205,7 @@ function onServerResponseClose() {
 // Ergo, we need to deal with stale 'close' events and handle the case
 // where the ServerResponse object has already been deconstructed.
 // Fortunately, that requires only a single if check. :-)
-if(this._httpMessage){
-this._httpMessage.destroyed=true;
-this._httpMessage.emit('close');
-}
+if(this._httpMessage)this._httpMessage.emit('close');
 }
 
 ServerResponse.prototype.assignSocket=functionassignSocket(socket){
@@ -537,7 +534,6 @@ function abortIncoming(incoming) {
 while(incoming.length){
 constreq=incoming.shift();
 req.aborted=true;
-req.destroyed=true;
 req.emit('aborted');
 req.emit('close');
 }
@@ -664,13 +660,11 @@ function clearIncoming(req) {
 if(parser&&parser.incoming===req){
 if(req.readableEnded){
 parser.incoming=null;
-req.destroyed=true;
 req.emit('close');
 }else{
 req.on('end',clearIncoming);
 }
 }else{
-req.destroyed=true;
 req.emit('close');
 }
 }
@@ -714,7 +708,6 @@ function resOnFinish(req, res, socket, state, server) {
 }
 
 functionemitCloseNT(self){
-self.destroyed=true;
 self.emit('close');
 }
 

test/parallel/test-http-client-res-destroyed.js

@@ -33,10 +33,7 @@ server.listen(0, common.mustCall(function() {
 path: 'example.com:443'
 },common.mustNotCall());
 
-assert.strictEqual(req.destroyed,false);
-req.on('close',common.mustCall(()=>{
-assert.strictEqual(req.destroyed,true);
-}));
+req.on('close',common.mustCall());
 
 req.on('connect',common.mustCall(function(res,socket,firstBodyChunk){
 console.error('Client got CONNECT request');

test/parallel/test-http-connect-req-res.js

@@ -62,10 +62,7 @@ server.listen(0, common.mustCall(() => {
 assert.strictEqual(socket._httpMessage,req);
 }));
 
-assert.strictEqual(req.destroyed,false);
-req.on('close',common.mustCall(()=>{
-assert.strictEqual(req.destroyed,true);
-}));
+req.on('close',common.mustCall());
 
 req.on('connect',common.mustCall((res,socket,firstBodyChunk)=>{
 // Make sure this request got removed from the pool.

test/parallel/test-http-connect.js

@@ -22,7 +22,6 @@
 'use strict';
 constcommon=require('../common');
 consthttp=require('http');
-constassert=require('assert');
 
 constserver=http.Server(function(req,res){
 res.writeHead(200,{'Content-Type': 'text/plain'});
@@ -44,12 +43,6 @@ server.listen(0, common.mustCall(function() {
 });
 }));
 
-res.on('end',common.mustCall(()=>{
-assert.strictEqual(res.destroyed,false);
-}));
-assert.strictEqual(res.destroyed,false);
-res.on('close',common.mustCall(()=>{
-assert.strictEqual(res.destroyed,true);
-}));
+res.on('end',common.mustCall());
 }));
 }));

test/parallel/test-http-pause-resume-one-end.js

@@ -8,25 +8,13 @@ const server = http.Server(common.mustCall((req, res) => {
 letresClosed=false;
 
 res.end();
-letresFinished=false;
 res.on('finish',common.mustCall(()=>{
-resFinished=true;
-assert.strictEqual(resClosed,false);
-assert.strictEqual(res.destroyed,false);
 assert.strictEqual(resClosed,false);
 }));
-assert.strictEqual(req.destroyed,false);
 res.on('close',common.mustCall(()=>{
 resClosed=true;
-assert.strictEqual(resFinished,true);
-assert.strictEqual(res.destroyed,true);
-}));
-assert.strictEqual(req.destroyed,false);
-req.on('end',common.mustCall(()=>{
-assert.strictEqual(req.destroyed,false);
 }));
 req.on('close',common.mustCall(()=>{
-assert.strictEqual(req.destroyed,true);
 assert.strictEqual(req._readableState.ended,true);
 }));
 res.socket.on('close',()=>server.close());

test/parallel/test-http-req-res-close.js

@@ -22,7 +22,6 @@
 'use strict';
 constcommon=require('../common');
 consthttp=require('http');
-constassert=require('assert');
 
 {
 constserver=http.createServer(
@@ -40,9 +39,7 @@ const assert = require('assert');
 res.on('data',common.mustCall(()=>{
 res.destroy();
 }));
-assert.strictEqual(res.destroyed,false);
 res.on('close',common.mustCall(()=>{
-assert.strictEqual(res.destroyed,true);
 server.close();
 }));
 })
@@ -64,12 +61,7 @@ const assert = require('assert');
 http.get(
 {port: server.address().port},
 common.mustCall((res)=>{
-assert.strictEqual(res.destroyed,false);
-res.on('end',common.mustCall(()=>{
-assert.strictEqual(res.destroyed,false);
-}));
 res.on('close',common.mustCall(()=>{
-assert.strictEqual(res.destroyed,true);
 server.close();
 }));
 res.resume();

test/parallel/test-http-response-close.js

@@ -23,7 +23,6 @@
 require('../common');
 consthttp=require('http');
 constfork=require('child_process').fork;
-constassert=require('assert');
 
 if(process.env.NODE_TEST_FORK_PORT){
 constreq=http.request({
@@ -38,9 +37,7 @@ if (process.env.NODE_TEST_FORK_PORT) {
 constserver=http.createServer((req,res)=>{
 res.writeHead(200,{'Content-Length': '42'});
 req.pipe(res);
-assert.strictEqual(req.destroyed,false);
 req.on('close',()=>{
-assert.strictEqual(req.destroyed,true);
 server.close();
 res.end();
 });