diff options
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | lib/net/http/response.rb | 1 | ||||
-rw-r--r-- | test/net/http/test_httpresponse.rb | 53 |
3 files changed, 62 insertions, 0 deletions
@@ -1,3 +1,11 @@ +Sat Aug 1 17:13:15 2015 Kazuki Tsujimoto <kazuki@callcc.net> + + * lib/net/http/response.rb (Net::HTTPResponse::Inflater#finish): + fix a bug that empty gzipped response body causes Zlib::BufError. + [ruby-core:68846] [Bug #11058] + + * test/net/http/test_httpresponse.rb: tests for the above. + Sat Aug 1 17:05:18 2015 Kazuki Tsujimoto <kazuki@callcc.net> * lib/net/http/response.rb (Net::HTTPResponse#inflater): diff --git a/lib/net/http/response.rb b/lib/net/http/response.rb index 253c5cbe98..126c22160d 100644 --- a/lib/net/http/response.rb +++ b/lib/net/http/response.rb @@ -359,6 +359,7 @@ class Net::HTTPResponse # Finishes the inflate stream. def finish + return if @inflate.total_in == 0 @inflate.finish end diff --git a/test/net/http/test_httpresponse.rb b/test/net/http/test_httpresponse.rb index 6dd2a37e43..a86020581c 100644 --- a/test/net/http/test_httpresponse.rb +++ b/test/net/http/test_httpresponse.rb @@ -237,6 +237,59 @@ EOS assert_equal "\x1F\x8B\b\x00\x00\x00\x00\x00\x00\x03", body end + def test_read_body_content_encoding_deflate_empty_body + io = dummy_io(<<EOS) +HTTP/1.1 200 OK +Connection: close +Content-Encoding: deflate +Content-Length: 0 + +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 '', body + else + assert_equal 'deflate', res['content-encoding'] + assert_equal '', body + end + end + + def test_read_body_content_encoding_deflate_empty_body_no_length + io = dummy_io(<<EOS) +HTTP/1.1 200 OK +Connection: close +Content-Encoding: deflate + +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 '', body + else + assert_equal 'deflate', res['content-encoding'] + assert_equal '', body + end + end + def test_read_body_string io = dummy_io(<<EOS) HTTP/1.1 200 OK |