mirror of
https://github.com/zebrajr/node.git
synced 2026-01-15 12:15:26 +00:00
http_client: ensure empty socket on error
Read all pending data out of the socket on `error` event and ensure that
no `data`/`end` handlers will be invoked on `socket.destroy()`.
Otherwise following assertion happens:
AssertionError: null == true
at TLSSocket.socketOnData (_http_client.js:308:3)
at TLSSocket.emit (events.js:107:17)
at TLSSocket.Readable.read (_stream_readable.js:373:10)
at TLSSocket.socketCloseListener (_http_client.js:229:10)
at TLSSocket.emit (events.js:129:20)
at TCP.close (net.js:476:12)
Fix: https://github.com/joyent/node/issues/9348
PR-URL: https://github.com/iojs/io.js/pull/1103
Reviewed-By: Rod Vagg <rod@vagg.org>
Reviewed-By: Nicu Micleușanu <micnic90@gmail.com>
This commit is contained in:
@@ -247,7 +247,6 @@ function socketCloseListener() {
|
||||
|
||||
function socketErrorListener(err) {
|
||||
var socket = this;
|
||||
var parser = socket.parser;
|
||||
var req = socket._httpMessage;
|
||||
debug('SOCKET ERROR:', err.message, err.stack);
|
||||
|
||||
@@ -258,10 +257,18 @@ function socketErrorListener(err) {
|
||||
req.socket._hadError = true;
|
||||
}
|
||||
|
||||
// Handle any pending data
|
||||
socket.read();
|
||||
|
||||
var parser = socket.parser;
|
||||
if (parser) {
|
||||
parser.finish();
|
||||
freeParser(parser, req, socket);
|
||||
}
|
||||
|
||||
// Ensure that no further data will come out of the socket
|
||||
socket.removeListener('data', socketOnData);
|
||||
socket.removeListener('end', socketOnEnd);
|
||||
socket.destroy();
|
||||
}
|
||||
|
||||
|
||||
42
test/parallel/test-http-client-read-in-error.js
Normal file
42
test/parallel/test-http-client-read-in-error.js
Normal file
@@ -0,0 +1,42 @@
|
||||
var net = require('net');
|
||||
var http = require('http');
|
||||
var util = require('util');
|
||||
|
||||
function Agent() {
|
||||
http.Agent.call(this);
|
||||
}
|
||||
util.inherits(Agent, http.Agent);
|
||||
|
||||
Agent.prototype.createConnection = function() {
|
||||
var self = this;
|
||||
var socket = new net.Socket();
|
||||
|
||||
socket.on('error', function() {
|
||||
socket.push('HTTP/1.1 200\r\n\r\n');
|
||||
});
|
||||
|
||||
socket.on('newListener', function onNewListener(name) {
|
||||
if (name !== 'error')
|
||||
return;
|
||||
socket.removeListener('newListener', onNewListener);
|
||||
|
||||
// Let other listeners to be set up too
|
||||
process.nextTick(function() {
|
||||
self.breakSocket(socket);
|
||||
});
|
||||
});
|
||||
|
||||
return socket;
|
||||
};
|
||||
|
||||
Agent.prototype.breakSocket = function breakSocket(socket) {
|
||||
socket.emit('error', new Error('Intentional error'));
|
||||
};
|
||||
|
||||
var agent = new Agent();
|
||||
|
||||
http.request({
|
||||
agent: agent
|
||||
}).once('error', function() {
|
||||
console.log('ignore');
|
||||
});
|
||||
Reference in New Issue
Block a user