Fix return value from .end and .write after end

Author: dougwilson

HISTORY.md

@@ -1,6 +1,7 @@
 unreleased
 ==========
 
+  * Fix return value from `.end` and `.write` after end
   * Improve detection of zero-length body without `Content-Length`
   * deps: accepts@~1.2.9
     - deps: mime-types@~2.1.1

index.js

@@ -49,24 +49,24 @@ function compression(options) {
   }
 
   return function compression(req, res, next){
+    var ended = false
     var length
     var listeners = []
     var write = res.write
     var on = res.on
     var end = res.end
     var stream
 
-    // see #8
-    req.on('close', function(){
-      res.write = res.end = noop
-    });
-
     // flush is noop by default
     res.flush = noop;
 
     // proxy
 
     res.write = function(chunk, encoding){
+      if (ended) {
+        return false
+      }
+
       if (!this._header) {
         this._implicitHeader()
       }
@@ -77,6 +77,10 @@ function compression(options) {
     };
 
     res.end = function(chunk, encoding){
+      if (ended) {
+        return false
+      }
+
       if (!this._header) {
         // estimate the length
         if (!this.getHeader('Content-Length')) {
@@ -90,6 +94,9 @@ function compression(options) {
         return end.call(this, chunk, encoding)
       }
 
+      // mark ended
+      ended = true
+
       // write Buffer for Node.js 0.8
       return chunk
         ? stream.end(new Buffer(chunk, encoding))

test/compression.js

@@ -434,6 +434,20 @@ describe('compression()', function(){
       .set('Accept-Encoding', 'gzip')
       .expect('Content-Encoding', 'gzip', done)
     })
+
+    it('should return false writing after end', function (done) {
+      var server = createServer({ threshold: 0 }, function (req, res) {
+        res.setHeader('Content-Type', 'text/plain')
+        res.end('hello, world')
+        assert.ok(res.write() === false)
+        assert.ok(res.end() === false)
+      })
+
+      request(server)
+      .get('/')
+      .set('Accept-Encoding', 'gzip')
+      .expect('Content-Encoding', 'gzip', done)
+    })
   })
 
   describe('when "Accept-Encoding: deflate"', function () {