http_server: fix resume after socket close
Socket resume may happen on a next tick, and in following scenario: 1. `socket.resume()` 2. `socket._handle.close()` 3. `socket._handle = null;` The `_resume` will be invoked with empty `._handle` property. There is nothing bad about it, and we should just ignore the `resume`/`pause` events in this case. Same applies to the unconsuming of socket on adding `data` and/or `readable` event listeners. Fix: https://github.com/nodejs/node/issues/2821 PR-URL: https://github.com/nodejs/node/pull/2824 Reviewed-By: Сковорода Никита Андреевич <chalkerx@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
This commit is contained in:
parent
3351305358
commit
7ec0491fd0
@ -512,10 +512,12 @@ function connectionListener(socket) {
|
|||||||
exports._connectionListener = connectionListener;
|
exports._connectionListener = connectionListener;
|
||||||
|
|
||||||
function onSocketResume() {
|
function onSocketResume() {
|
||||||
|
if (this._handle)
|
||||||
this._handle.readStart();
|
this._handle.readStart();
|
||||||
}
|
}
|
||||||
|
|
||||||
function onSocketPause() {
|
function onSocketPause() {
|
||||||
|
if (this._handle)
|
||||||
this._handle.readStop();
|
this._handle.readStop();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -526,7 +528,7 @@ function socketOnWrap(ev, fn) {
|
|||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ev === 'data' || ev === 'readable')
|
if (this._handle && (ev === 'data' || ev === 'readable'))
|
||||||
this.parser.unconsume(this._handle._externalStream);
|
this.parser.unconsume(this._handle._externalStream);
|
||||||
|
|
||||||
return res;
|
return res;
|
||||||
|
24
test/parallel/test-http-regr-gh-2821.js
Normal file
24
test/parallel/test-http-regr-gh-2821.js
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
'use strict';
|
||||||
|
const common = require('../common');
|
||||||
|
const assert = require('assert');
|
||||||
|
const http = require('http');
|
||||||
|
|
||||||
|
const server = http.createServer(function(req, res) {
|
||||||
|
res.writeHead(200);
|
||||||
|
res.end();
|
||||||
|
|
||||||
|
server.close();
|
||||||
|
});
|
||||||
|
|
||||||
|
server.listen(common.PORT, function() {
|
||||||
|
|
||||||
|
const req = http.request({
|
||||||
|
method: 'POST',
|
||||||
|
port: common.PORT
|
||||||
|
});
|
||||||
|
|
||||||
|
const payload = new Buffer(16390);
|
||||||
|
payload.fill('Й');
|
||||||
|
req.write(payload);
|
||||||
|
req.end();
|
||||||
|
});
|
Loading…
x
Reference in New Issue
Block a user