Trying to solve hapijs#789

jmonster · Apr 25, 2013 · a2298b5 · a2298b5
1 parent 46334ee
commit a2298b5
Showing 1 changed file with 4 additions and 15 deletions.
diff --git a/lib/response/stream.js b/lib/response/stream.js
@@ -169,24 +169,13 @@ internals.Stream.prototype._transmit = function (request, callback) {
         isEnded = true;
         self._preview.end();
         request.raw.res.end();
+        self._stream.destroy && self._stream.destroy();
         callback();
     };
 
-    request.raw.req.once('close', function () {
-
-        end();
-    });
-
-    this._stream.once('error', function () {
-
-        request.raw.req.destroy();
-        end();
-    });
-
-    (encoder || this._stream).once('end', function () {
-
-        end();
-    });
+    request.raw.req.once('close', end);
+    this._stream.once('error', end);
+    (encoder || this._stream).once('end', end);
 
     this._stream.pipe(this._preview);
     (encoder ? this._stream.pipe(encoder) : this._stream).pipe(request.raw.res, { end: false });