From 8c5a6fb6843b865f2b1fb622037f312daa7be6a7 Mon Sep 17 00:00:00 2001
From: drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 14 Feb 2013 01:09:37 +0000
Subject: [PATCH] * 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.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39233 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog b/ChangeLog
index 927586d150..f948041925 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@ Thu Feb 14 10:05:57 2013  Eric Hodel  <drbrain@segment7.net>
 	* 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.