Adjust #3292

hapijs · Aug 26, 2016 · 4278425 · 4278425
1 parent 49a60d5
commit 4278425
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/lib/compression.js b/lib/compression.js
@@ -59,8 +59,17 @@ internals.Compression.prototype.encoding = function (response) {
     }
 
     const mime = request.server.mime.type(response.headers['content-type'] || 'application/octet-stream');
-    const encoding = (mime.compressible && !response.headers['content-encoding'] ? request.info.acceptEncoding : null);
-    return (encoding === 'identity' ? null : encoding);
+    if (!mime.compressible) {
+        return null;
+    }
+
+    response.vary('accept-encoding');
+
+    if (response.headers['content-encoding']) {
+        return null;
+    }
+
+    return (request.info.acceptEncoding === 'identity' ? null : request.info.acceptEncoding);
 };
 
 

diff --git a/lib/transmit.js b/lib/transmit.js
@@ -201,8 +201,6 @@ internals.transmit = function (response, callback) {
 
     // Content-Encoding
 
-    response.vary('accept-encoding');
-
     let compressor = null;
     if (encoding &&
         length !== 0 &&

diff --git a/test/transmit.js b/test/transmit.js
@@ -929,6 +929,7 @@ describe('transmission', () => {
                 expect(res.headers['content-type']).to.equal('image/png');
                 expect(res.headers['content-encoding']).to.not.exist();
                 expect(res.headers['content-length']).to.equal(42010);
+                expect(res.headers.vary).to.not.exist();
                 expect(res.payload).to.exist();
                 done();
             });