From f4a4ef7a2da34ec9d155f82df0133b40382c53e9 Mon Sep 17 00:00:00 2001 From: Dominic Tarr Date: Wed, 25 Jul 2012 02:40:58 +1200 Subject: [PATCH] zlib: Emit 'close' on destroy(). --- lib/zlib.js | 1 + test/simple/test-zlib-destroy.js | 36 ++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 test/simple/test-zlib-destroy.js diff --git a/lib/zlib.js b/lib/zlib.js index f05f6d139..7837f3f7b 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 000000000..7a1120e28 --- /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\''); + }); -- 2.34.1