diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-06-29 07:14:31 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-06-29 07:14:31 +0000 |
| commit | 84de36c74831bb6420fcd3c224fc515380e28350 (patch) | |
| tree | 71768a2745b4ad8ab360d107b1d2e8ec32d9f806 | |
| parent | 8803c6016fa211b40d63bc1a7e6ffa32ac4a75c4 (diff) | |
* lib/net/http/response.rb (inflater): CONTENT_ENCODING can be upper
case. [ruby-core:69670] [Bug #11285] patched by Andy Chu
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51061 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/net/http/response.rb | 2 | ||||
| -rw-r--r-- | test/net/http/test_httpresponse.rb | 28 |
3 files changed, 34 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Mon Jun 29 16:01:24 2015 NARUSE, Yui <naruse@ruby-lang.org> + + * lib/net/http/response.rb (inflater): CONTENT_ENCODING can be upper + case. [ruby-core:69670] [Bug #11285] patched by Andy Chu + Mon Jun 29 14:50:08 2015 Shugo Maeda <shugo@ruby-lang.org> * eval.c (add_activated_refinement): should not include the original diff --git a/lib/net/http/response.rb b/lib/net/http/response.rb index b0731694ca..219e14e777 100644 --- a/lib/net/http/response.rb +++ b/lib/net/http/response.rb @@ -250,7 +250,7 @@ class Net::HTTPResponse return yield @socket unless @decode_content return yield @socket if self['content-range'] - case self['content-encoding'] + case self['content-encoding'].downcase when 'deflate', 'gzip', 'x-gzip' then self.delete 'content-encoding' diff --git a/test/net/http/test_httpresponse.rb b/test/net/http/test_httpresponse.rb index ba8b45eaca..7d378648b3 100644 --- a/test/net/http/test_httpresponse.rb +++ b/test/net/http/test_httpresponse.rb @@ -103,6 +103,34 @@ EOS end end + def test_read_body_content_encoding_deflate_uppercase + io = dummy_io(<<EOS) +HTTP/1.1 200 OK +Connection: close +Content-Encoding: DEFLATE +Content-Length: 13 + +x\x9C\xCBH\xCD\xC9\xC9\a\x00\x06,\x02\x15 +EOS + + res = Net::HTTPResponse.read_new(io) + res.decode_content = true + + body = nil + + res.reading_body io, true do + body = res.read_body + end + + if Net::HTTP::HAVE_ZLIB + assert_equal nil, res['content-encoding'] + assert_equal 'hello', body + else + assert_equal 'deflate', res['content-encoding'] + assert_equal "x\x9C\xCBH\xCD\xC9\xC9\a\x00\x06,\x02\x15", body + end + end + def test_read_body_content_encoding_deflate_chunked io = dummy_io(<<EOS) HTTP/1.1 200 OK |