summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominic Tarr <dominic.tarr@gmail.com>2012-07-25 02:40:58 +1200
committerisaacs <i@izs.me>2012-08-04 13:04:15 -0700
commitf4a4ef7a2da34ec9d155f82df0133b40382c53e9 (patch)
treea3f356c477f307fc778eec9e25c2931435c352e6
parentb48684c6f1958930741e2cf34a6a6d5cafa7f478 (diff)
downloadnode-new-f4a4ef7a2da34ec9d155f82df0133b40382c53e9.tar.gz
zlib: Emit 'close' on destroy().
-rw-r--r--lib/zlib.js1
-rw-r--r--test/simple/test-zlib-destroy.js36
2 files changed, 37 insertions, 0 deletions
diff --git a/lib/zlib.js b/lib/zlib.js
index f05f6d1399..7837f3f7bc 100644
--- a/lib/zlib.js
+++ b/lib/zlib.js
@@ -455,6 +455,7 @@ Zlib.prototype.destroy = function() {
this.readable = false;
this.writable = false;
this._ended = true;
+ this.emit('close');
};
util.inherits(Deflate, Zlib);
diff --git a/test/simple/test-zlib-destroy.js b/test/simple/test-zlib-destroy.js
new file mode 100644
index 0000000000..7a1120e284
--- /dev/null
+++ b/test/simple/test-zlib-destroy.js
@@ -0,0 +1,36 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+var common = require('../common');
+var assert = require('assert');
+var zlib = require('zlib');
+
+['Deflate', 'Inflate', 'Gzip', 'Gunzip', 'DeflateRaw', 'InflateRaw', 'Unzip']
+ .forEach(function (name) {
+ var a = false;
+ var zStream = new zlib[name]();
+ zStream.on('close', function () {
+ a = true;
+ });
+ zStream.destroy();
+
+ assert.equal(a, true, name+'#destroy() must emit \'close\'');
+ });