1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix GH-820. CryptoStream.end shouldn't throw if not writable

Browse Source 
This matches the behavior of net.Socket
This commit is contained in:
Ryan Dahl 2011-03-21 14:36:30 -07:00
parent 4198de280f
commit 7e28630f5e
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
lib/tls.js
View File

@ -168,25 +168,23 @@ CryptoStream.prototype.getCipher = function(err) {
CryptoStream.prototype.end = function(d) { CryptoStream.prototype.end = function(d) {
if (!this.writable) { if (this.writable) {
throw new Error('CryptoStream is not writable'); if (this.pair._done) return;
if (d) {
this.write(d);
}
this._pending.push(END_OF_FILE);
this._pendingCallbacks.push(null);
// If this is an encrypted stream then we need to disable further 'data'
// events.
this.writable = false;
this.pair._cycle();
} }
if (this.pair._done) return;
if (d) {
this.write(d);
}
this._pending.push(END_OF_FILE);
this._pendingCallbacks.push(null);
// If this is an encrypted stream then we need to disable further 'data'
// events.
this.writable = false;
this.pair._cycle();
}; };