net: unref timer in parent sockets
`TLSSocket` wraps the original `net.Socket`, but writes/reads to/from `TLSSocket` do not touch the timers of original `net.Socket`. Introduce `socket._parent` property, and iterate through all parents to unref timers and prevent timeout event on original `net.Socket`. Fix: https://github.com/joyent/node/issues/9242 PR-URL: https://github.com/iojs/io.js/pull/891 Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
This commit is contained in:
parent
ecef87177a
commit
9b6b05556f
@ -213,10 +213,12 @@ function TLSSocket(socket, options) {
|
|||||||
readable: false,
|
readable: false,
|
||||||
writable: false
|
writable: false
|
||||||
});
|
});
|
||||||
|
if (socket) {
|
||||||
|
this._parent = socket;
|
||||||
|
|
||||||
// To prevent assertion in afterConnect()
|
// To prevent assertion in afterConnect()
|
||||||
if (socket)
|
|
||||||
this._connecting = socket._connecting;
|
this._connecting = socket._connecting;
|
||||||
|
}
|
||||||
|
|
||||||
this._tlsOptions = options;
|
this._tlsOptions = options;
|
||||||
this._secureEstablished = false;
|
this._secureEstablished = false;
|
||||||
|
21
lib/net.js
21
lib/net.js
@ -120,6 +120,7 @@ function Socket(options) {
|
|||||||
this._connecting = false;
|
this._connecting = false;
|
||||||
this._hadError = false;
|
this._hadError = false;
|
||||||
this._handle = null;
|
this._handle = null;
|
||||||
|
this._parent = null;
|
||||||
this._host = null;
|
this._host = null;
|
||||||
|
|
||||||
if (typeof options === 'number')
|
if (typeof options === 'number')
|
||||||
@ -179,6 +180,11 @@ function Socket(options) {
|
|||||||
}
|
}
|
||||||
util.inherits(Socket, stream.Duplex);
|
util.inherits(Socket, stream.Duplex);
|
||||||
|
|
||||||
|
Socket.prototype._unrefTimer = function unrefTimer() {
|
||||||
|
for (var s = this; s !== null; s = s._parent)
|
||||||
|
timers._unrefActive(s);
|
||||||
|
};
|
||||||
|
|
||||||
// the user has called .end(), and all the bytes have been
|
// the user has called .end(), and all the bytes have been
|
||||||
// sent out to the other side.
|
// sent out to the other side.
|
||||||
// If allowHalfOpen is false, or if the readable side has
|
// If allowHalfOpen is false, or if the readable side has
|
||||||
@ -445,7 +451,8 @@ Socket.prototype._destroy = function(exception, cb) {
|
|||||||
|
|
||||||
this.readable = this.writable = false;
|
this.readable = this.writable = false;
|
||||||
|
|
||||||
timers.unenroll(this);
|
for (var s = this; s !== null; s = s._parent)
|
||||||
|
timers.unenroll(s);
|
||||||
|
|
||||||
debug('close');
|
debug('close');
|
||||||
if (this._handle) {
|
if (this._handle) {
|
||||||
@ -490,7 +497,7 @@ function onread(nread, buffer) {
|
|||||||
var self = handle.owner;
|
var self = handle.owner;
|
||||||
assert(handle === self._handle, 'handle != self._handle');
|
assert(handle === self._handle, 'handle != self._handle');
|
||||||
|
|
||||||
timers._unrefActive(self);
|
self._unrefTimer();
|
||||||
|
|
||||||
debug('onread', nread);
|
debug('onread', nread);
|
||||||
|
|
||||||
@ -621,7 +628,7 @@ Socket.prototype._writeGeneric = function(writev, data, encoding, cb) {
|
|||||||
this._pendingData = null;
|
this._pendingData = null;
|
||||||
this._pendingEncoding = '';
|
this._pendingEncoding = '';
|
||||||
|
|
||||||
timers._unrefActive(this);
|
this._unrefTimer();
|
||||||
|
|
||||||
if (!this._handle) {
|
if (!this._handle) {
|
||||||
this._destroy(new Error('This socket is closed.'), cb);
|
this._destroy(new Error('This socket is closed.'), cb);
|
||||||
@ -749,7 +756,7 @@ function afterWrite(status, handle, req, err) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
timers._unrefActive(self);
|
self._unrefTimer();
|
||||||
|
|
||||||
if (self !== process.stderr && self !== process.stdout)
|
if (self !== process.stderr && self !== process.stdout)
|
||||||
debug('afterWrite call cb');
|
debug('afterWrite call cb');
|
||||||
@ -864,7 +871,7 @@ Socket.prototype.connect = function(options, cb) {
|
|||||||
self.once('connect', cb);
|
self.once('connect', cb);
|
||||||
}
|
}
|
||||||
|
|
||||||
timers._unrefActive(this);
|
this._unrefTimer();
|
||||||
|
|
||||||
self._connecting = true;
|
self._connecting = true;
|
||||||
self.writable = true;
|
self.writable = true;
|
||||||
@ -919,7 +926,7 @@ Socket.prototype.connect = function(options, cb) {
|
|||||||
self._destroy();
|
self._destroy();
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
timers._unrefActive(self);
|
self._unrefTimer();
|
||||||
connect(self,
|
connect(self,
|
||||||
ip,
|
ip,
|
||||||
port,
|
port,
|
||||||
@ -964,7 +971,7 @@ function afterConnect(status, handle, req, readable, writable) {
|
|||||||
if (status == 0) {
|
if (status == 0) {
|
||||||
self.readable = readable;
|
self.readable = readable;
|
||||||
self.writable = writable;
|
self.writable = writable;
|
||||||
timers._unrefActive(self);
|
self._unrefTimer();
|
||||||
|
|
||||||
self.emit('connect');
|
self.emit('connect');
|
||||||
|
|
||||||
|
34
test/parallel/test-tls-wrap-timeout.js
Normal file
34
test/parallel/test-tls-wrap-timeout.js
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
if (!process.versions.openssl) process.exit();
|
||||||
|
|
||||||
|
var common = require('../common');
|
||||||
|
var assert = require('assert');
|
||||||
|
var net = require('net');
|
||||||
|
var tls = require('tls');
|
||||||
|
var fs = require('fs');
|
||||||
|
|
||||||
|
var options = {
|
||||||
|
key: fs.readFileSync(common.fixturesDir + '/keys/agent1-key.pem'),
|
||||||
|
cert: fs.readFileSync(common.fixturesDir + '/keys/agent1-cert.pem')
|
||||||
|
};
|
||||||
|
|
||||||
|
var server = tls.createServer(options, function(c) {
|
||||||
|
setTimeout(function() {
|
||||||
|
c.write('hello');
|
||||||
|
setTimeout(function() {
|
||||||
|
c.destroy();
|
||||||
|
server.close();
|
||||||
|
}, 75);
|
||||||
|
}, 75);
|
||||||
|
});
|
||||||
|
|
||||||
|
server.listen(common.PORT, function() {
|
||||||
|
var socket = net.connect(common.PORT, function() {
|
||||||
|
socket.setTimeout(120, assert.fail);
|
||||||
|
|
||||||
|
var tsocket = tls.connect({
|
||||||
|
socket: socket,
|
||||||
|
rejectUnauthorized: false
|
||||||
|
});
|
||||||
|
tsocket.resume();
|
||||||
|
});
|
||||||
|
});
|
Loading…
x
Reference in New Issue
Block a user