archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-16 17:14:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

merge revision(s) 51061,51063,51091: [Backport #11285]

Browse source 
* lib/net/http/response.rb (inflater): CONTENT_ENCODING can be upper
	  case. [ruby-core:69670] [Bug #11285] patched by Andy Chu

	* test/net/http/test_httpresponse.rb
	(HTTPResponseTest#test_read_body_content_encoding_deflate_uppercase):
	fix a failure without zlib.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@51522 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2015-08-10 16:47:03 +00:00
parent e49c2e3569
commit 3b90cf70d1
4 changed files with 42 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
Tue Aug 11 01:37:28 2015 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
* test/net/http/test_httpresponse.rb
(HTTPResponseTest#test_read_body_content_encoding_deflate_uppercase):
fix a failure without zlib.
Tue Aug 11 01:37:28 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
Tue Aug 11 01:21:49 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> Tue Aug 11 01:21:49 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* vm.c (m_core_hash_merge_ptr): copy the arguments to the machine * vm.c (m_core_hash_merge_ptr): copy the arguments to the machine

3
lib/net/http/response.rb
View file

@ -250,7 +250,8 @@ class Net::HTTPResponse
return yield @socket unless @decode_content return yield @socket unless @decode_content
return yield @socket if self['content-range'] return yield @socket if self['content-range']
case self['content-encoding'] v = self['content-encoding']
case v && v.downcase
when 'deflate', 'gzip', 'x-gzip' then when 'deflate', 'gzip', 'x-gzip' then
self.delete 'content-encoding' self.delete 'content-encoding'

28
test/net/http/test_httpresponse.rb
View file

@ -103,6 +103,34 @@ EOS
end end
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 def test_read_body_content_encoding_deflate_chunked
io = dummy_io(<<EOS) io = dummy_io(<<EOS)
HTTP/1.1 200 OK HTTP/1.1 200 OK

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.2.3" #define RUBY_VERSION "2.2.3"
#define RUBY_RELEASE_DATE "2015-08-11" #define RUBY_RELEASE_DATE "2015-08-11"
#define RUBY_PATCHLEVEL 154 #define RUBY_PATCHLEVEL 155
#define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_YEAR 2015
#define RUBY_RELEASE_MONTH 8 #define RUBY_RELEASE_MONTH 8