Browse Source

TLS: emit 'end' on both streams

v0.7.4-release
Ryan Dahl 14 years ago
parent
commit
13b14300b9
  1. 4
      lib/tls.js
  2. 9
      test/simple/test-tls-server-verify.js

4
lib/tls.js

@ -348,7 +348,11 @@ SecurePair.prototype._destroy = function(err) {
this._done = true; this._done = true;
this._ssl.close(); this._ssl.close();
this._ssl = null; this._ssl = null;
this.encrypted.emit('end');
this.encrypted.emit('close'); this.encrypted.emit('close');
this.cleartext.emit('end');
this.cleartext.emit('close'); this.cleartext.emit('close');
} }
this._cycle(); this._cycle();

9
test/simple/test-tls-server-verify.js

@ -140,7 +140,8 @@ function runClient (options, cb) {
//client.stdout.pipe(process.stdout); //client.stdout.pipe(process.stdout);
client.on('exit', function(code) { client.on('exit', function(code) {
assert.equal(0, code); //assert.equal(0, code, options.name +
// ": s_client exited with error code " + code);
if (options.shouldReject) { if (options.shouldReject) {
assert.equal(true, rejected, options.name + assert.equal(true, rejected, options.name +
" NOT rejected, but should have been"); " NOT rejected, but should have been");
@ -199,7 +200,11 @@ function runTest (testIndex) {
} }
server.listen(common.PORT, function() { server.listen(common.PORT, function() {
runNextClient(0); if (tcase.debug) {
console.error("TLS server running on port " + common.PORT);
} else {
runNextClient(0);
}
}); });
} }

Loading…
Cancel
Save