https was missing 'end' event sometimes
Closes GH-671.
This commit is contained in:
parent
42a369620f
commit
c365f56061
@ -1009,13 +1009,13 @@ function connectionListener(socket) {
|
|||||||
|
|
||||||
if (!self.httpAllowHalfOpen) {
|
if (!self.httpAllowHalfOpen) {
|
||||||
abortIncoming();
|
abortIncoming();
|
||||||
socket.end();
|
if (socket.writable) socket.end();
|
||||||
} else if (outgoing.length) {
|
} else if (outgoing.length) {
|
||||||
outgoing[outgoing.length - 1]._last = true;
|
outgoing[outgoing.length - 1]._last = true;
|
||||||
} else if (socket._httpMessage) {
|
} else if (socket._httpMessage) {
|
||||||
socket._httpMessage._last = true;
|
socket._httpMessage._last = true;
|
||||||
} else {
|
} else {
|
||||||
socket.end();
|
if (socket.writable) socket.end();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
15
lib/tls.js
15
lib/tls.js
@ -531,18 +531,25 @@ SecurePair.prototype._maybeInitFinished = function() {
|
|||||||
|
|
||||||
|
|
||||||
SecurePair.prototype._destroy = function() {
|
SecurePair.prototype._destroy = function() {
|
||||||
|
var self = this;
|
||||||
|
|
||||||
if (!this._done) {
|
if (!this._done) {
|
||||||
this._done = true;
|
this._done = true;
|
||||||
this._ssl.error = null;
|
this._ssl.error = null;
|
||||||
this._ssl.close();
|
this._ssl.close();
|
||||||
this._ssl = null;
|
this._ssl = null;
|
||||||
|
|
||||||
this.encrypted.emit('end');
|
process.nextTick(function() {
|
||||||
this.encrypted.emit('close');
|
self.encrypted.emit('end');
|
||||||
|
if (self.encrypted.onend) self.encrypted.onend();
|
||||||
|
self.encrypted.emit('close');
|
||||||
|
|
||||||
this.cleartext.emit('end');
|
self.cleartext.emit('end');
|
||||||
this.cleartext.emit('close');
|
if (self.cleartext.onend) self.cleartext.onend();
|
||||||
|
self.cleartext.emit('close');
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
this._cycle();
|
this._cycle();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
77
test/simple/test-https-eof-for-eom.js
Normal file
77
test/simple/test-https-eof-for-eom.js
Normal file
@ -0,0 +1,77 @@
|
|||||||
|
// I hate HTTP. One way of terminating an HTTP response is to not send
|
||||||
|
// a content-length header, not send a transfer-encoding: chunked header,
|
||||||
|
// and simply terminate the TCP connection. That is identity
|
||||||
|
// transfer-encoding.
|
||||||
|
//
|
||||||
|
// This test is to be sure that the https client is handling this case
|
||||||
|
// correctly.
|
||||||
|
if (!process.versions.openssl) {
|
||||||
|
console.error('Skipping because node compiled without OpenSSL.');
|
||||||
|
process.exit(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
var common = require('../common');
|
||||||
|
var assert = require('assert');
|
||||||
|
var tls = require('tls');
|
||||||
|
var https = require('https');
|
||||||
|
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.Server(options, function(socket) {
|
||||||
|
console.log('2) Server got request');
|
||||||
|
socket.write('HTTP/1.1 200 OK\r\n' +
|
||||||
|
'Date: Tue, 15 Feb 2011 22:14:54 GMT\r\n' +
|
||||||
|
'Expires: -1\r\n' +
|
||||||
|
'Cache-Control: private, max-age=0\r\n' +
|
||||||
|
'Set-Cookie: xyz\r\n' +
|
||||||
|
'Set-Cookie: abc\r\n' +
|
||||||
|
'Server: gws\r\n' +
|
||||||
|
'X-XSS-Protection: 1; mode=block\r\n' +
|
||||||
|
'Connection: close\r\n' +
|
||||||
|
'\r\n');
|
||||||
|
|
||||||
|
socket.write('hello world\n');
|
||||||
|
|
||||||
|
setTimeout(function() {
|
||||||
|
socket.end('hello world\n');
|
||||||
|
console.log('4) Server finished response');
|
||||||
|
}, 100);
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
|
var gotHeaders = false;
|
||||||
|
var gotEnd = false;
|
||||||
|
var bodyBuffer = '';
|
||||||
|
|
||||||
|
server.listen(common.PORT, function() {
|
||||||
|
console.log('1) Making Request');
|
||||||
|
var req = https.get({ port: common.PORT }, function(res) {
|
||||||
|
server.close();
|
||||||
|
console.log('3) Client got response headers.');
|
||||||
|
|
||||||
|
assert.equal('gws', res.headers.server);
|
||||||
|
gotHeaders = true;
|
||||||
|
|
||||||
|
res.setEncoding('utf8');
|
||||||
|
res.on('data', function(s) {
|
||||||
|
bodyBuffer += s;
|
||||||
|
});
|
||||||
|
|
||||||
|
res.on('end', function() {
|
||||||
|
console.log('5) Client got "end" event.');
|
||||||
|
gotEnd = true;
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
process.on('exit', function() {
|
||||||
|
assert.ok(gotHeaders);
|
||||||
|
assert.ok(gotEnd);
|
||||||
|
assert.equal('hello world\nhello world\n', bodyBuffer);
|
||||||
|
});
|
||||||
|
|
Loading…
x
Reference in New Issue
Block a user