include encoding in "unsupported content encoding" message

papandreou · Sep 24, 2014 · 360cf1b · 360cf1b
1 parent 6330764
commit 360cf1b
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 5 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -2,6 +2,7 @@ unreleased
 ==========
 
   * include the charset in "unsupported charset" error message
+  * include the encoding in "unsupported content encoding" error message
   * deps: depd@~1.0.0
 
 1.8.4 / 2014-09-23

diff --git a/lib/read.js b/lib/read.js
@@ -143,7 +143,8 @@ function contentstream(req, inflate) {
       stream.length = length
       break
     default:
-      err = new Error('unsupported content encoding')
+      err = new Error('unsupported content encoding "' + encoding + '"')
+      err.encoding = encoding
       err.status = 415
       throw err
   }

diff --git a/test/json.js b/test/json.js
@@ -432,7 +432,7 @@ describe('bodyParser.json()', function(){
       test.set('Content-Encoding', 'nulls')
       test.set('Content-Type', 'application/json')
       test.write(new Buffer('000000000000', 'hex'))
-      test.expect(415, 'unsupported content encoding', done)
+      test.expect(415, 'unsupported content encoding "nulls"', done)
     })
 
     it('should 400 on malformed encoding', function(done){

diff --git a/test/raw.js b/test/raw.js
@@ -284,7 +284,7 @@ describe('bodyParser.raw()', function(){
       test.set('Content-Encoding', 'nulls')
       test.set('Content-Type', 'application/octet-stream')
       test.write(new Buffer('000000000000', 'hex'))
-      test.expect(415, 'unsupported content encoding', done)
+      test.expect(415, 'unsupported content encoding "nulls"', done)
     })
   })
 })

diff --git a/test/text.js b/test/text.js
@@ -343,7 +343,7 @@ describe('bodyParser.text()', function(){
       test.set('Content-Encoding', 'nulls')
       test.set('Content-Type', 'text/plain')
       test.write(new Buffer('000000000000', 'hex'))
-      test.expect(415, 'unsupported content encoding', done)
+      test.expect(415, 'unsupported content encoding "nulls"', done)
     })
   })
 })

diff --git a/test/urlencoded.js b/test/urlencoded.js
@@ -491,7 +491,7 @@ describe('bodyParser.urlencoded()', function(){
       test.set('Content-Encoding', 'nulls')
       test.set('Content-Type', 'application/x-www-form-urlencoded')
       test.write(new Buffer('000000000000', 'hex'))
-      test.expect(415, 'unsupported content encoding', done)
+      test.expect(415, 'unsupported content encoding "nulls"', done)
     })
   })
 })