fix: don't handle * in enforceEncoding

expressjs · Jan 16, 2025 · 6071e4e · 6071e4e
1 parent 82c9cb5
commit 6071e4e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/index.js b/index.js
@@ -44,8 +44,6 @@ var cacheControlNoTransformRegExp = /(?:^|,)\s*?no-transform\s*?(?:,|$)/
 var SUPPORTED_ENCODING = hasBrotliSupport ? ['br', 'gzip', 'deflate', 'identity'] : ['gzip', 'deflate', 'identity']
 var PREFERRED_ENCODING = hasBrotliSupport ? ['br', 'gzip'] : ['gzip']
 
-var encodingSupported = ['*', 'gzip', 'deflate', 'identity', 'br']
-
 /**
  * Compress response data with gzip / deflate.
  *
@@ -199,8 +197,8 @@ function compression (options) {
       var method = negotiator.encoding(SUPPORTED_ENCODING, PREFERRED_ENCODING)
 
       // if no method is found, use the default encoding
-      if (!req.headers['accept-encoding'] && encodingSupported.indexOf(enforceEncoding) !== -1) {
-        method = enforceEncoding === '*' ? 'gzip' : enforceEncoding
+      if (!req.headers['accept-encoding']) {
+        method = ['gzip', 'deflate', 'identity', 'br'].includes(enforceEncoding) ? enforceEncoding : method
       }
 
       // negotiation failed

diff --git a/test/compression.js b/test/compression.js
@@ -960,7 +960,7 @@ describe('compression()', function () {
         .expect(200, 'hello, world', done)
     })
 
-    it('should be gzip if no accept-encoding is sent when enforceEncoding is *', function (done) {
+    it('should not compress when enforceEnconding is *', function (done) {
       var server = createServer({ threshold: 0, enforceEncoding: '*' }, function (req, res) {
         res.setHeader('Content-Type', 'text/plain')
         res.end('hello, world')
@@ -969,8 +969,8 @@ describe('compression()', function () {
       request(server)
         .get('/')
         .set('Accept-Encoding', '')
-        .expect('Content-Encoding', 'gzip')
-        .expect(200, 'hello, world', done)
+        .expect(shouldNotHaveHeader('Content-Encoding'))
+        .expect(200, done)
     })
   })
 })