From ddddf044b27c87b0b2d5b31bb1ed2277f211ec1e Mon Sep 17 00:00:00 2001 From: naruse Date: Thu, 14 Feb 2013 15:51:45 +0000 Subject: merge revision(s) 39232,39233,39238: [Backport #7831][Backport #7852] * lib/net/http: Do not handle Content-Encoding when the user sets Accept-Encoding. This allows users to handle Content-Encoding for themselves. This restores backwards-compatibility with Ruby 1.x. * lib/net/http/generic_request.rb: ditto. * lib/net/http/response.rb: ditto * test/net/http/test_http.rb: Test for the above. * test/net/http/test_http_request.rb: ditto. * test/net/http/test_httpresponse.rb: ditto. [ruby-trunk - Bug #7831] * lib/net/http.rb: Removed OpenSSL dependency from Net::HTTP. * test/net/http/test_http.rb: Remove Zlib dependency from tests. * test/net/http/test_http_request.rb: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39244 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 60d2863b5e..9d26674467 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,22 @@ +Fri Feb 15 00:49:32 2013 Eric Hodel + + * lib/net/http.rb: Removed OpenSSL dependency from Net::HTTP. + + * test/net/http/test_http.rb: Remove Zlib dependency from tests. + * test/net/http/test_http_request.rb: ditto. + +Fri Feb 15 00:49:32 2013 Eric Hodel + + * lib/net/http: Do not handle Content-Encoding when the user sets + Accept-Encoding. This allows users to handle Content-Encoding for + themselves. This restores backwards-compatibility with Ruby 1.x. + [ruby-trunk - Bug #7831] + * lib/net/http/generic_request.rb: ditto. + * lib/net/http/response.rb: ditto + * test/net/http/test_http.rb: Test for the above. + * test/net/http/test_http_request.rb: ditto. + * test/net/http/test_httpresponse.rb: ditto. + Thu Feb 14 13:17:10 2013 Zachary Scott * Backport r39168 Warning about TracePoint events to 2.0.0 -- cgit v1.2.3