drbrain	2013-02-24 15:19:29 +0900 (Sun, 24 Feb 2013)

  New Revision: 39464

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=39464

  Log:
    Merge trunk revision: 39463
    
    * lib/net/http.rb:  Removed duplicate Accept-Encoding in Net::HTTP#get.
      [ruby-trunk - Bug #7924]
    * test/net/http/test_http.rb:  Test for the above.

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/lib/net/http.rb
    branches/ruby_2_0_0/test/net/http/test_http.rb

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 39463)
+++ ruby_2_0_0/ChangeLog	(revision 39464)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Sun Feb 24 15:16:00 2013  Eric Hodel  <drbrain@s...>
+
+	* lib/net/http.rb:  Removed duplicate Accept-Encoding in Net::HTTP#get.
+	  [ruby-trunk - Bug #7924]
+	* test/net/http/test_http.rb:  Test for the above.
+
 Wed Feb 20 14:23:00 2013  Zachary Scott  <zachary@z...>
 
 	* thread.c: Grammar for #backtrace_locations and ::handle_interrupt
Index: ruby_2_0_0/lib/net/http.rb
===================================================================
--- ruby_2_0_0/lib/net/http.rb	(revision 39463)
+++ ruby_2_0_0/lib/net/http.rb	(revision 39464)
@@ -1122,13 +1122,6 @@ module Net   #:nodoc: https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/net/http.rb#L1122
     #
     def get(path, initheader = {}, dest = nil, &block) # :yield: +body_segment+
       res = nil
-      if HAVE_ZLIB
-        unless  initheader.keys.any?{|k| k.downcase == "accept-encoding"}
-          initheader = initheader.merge({
-            "accept-encoding" => "gzip;q=1.0,deflate;q=0.6,identity;q=0.3"
-          })
-        end
-      end
       request(Get.new(path, initheader)) {|r|
         r.read_body dest, &block
         res = r
Index: ruby_2_0_0/test/net/http/test_http.rb
===================================================================
--- ruby_2_0_0/test/net/http/test_http.rb	(revision 39463)
+++ ruby_2_0_0/test/net/http/test_http.rb	(revision 39464)
@@ -232,6 +232,8 @@ module TestNetHTTP_version_1_1_methods https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/net/http/test_http.rb#L232
     assert_nothing_raised {
       http.get('/', { 'User-Agent' => 'test' }.freeze)
     }
+
+    assert res.decode_content, '[Bug #7924]'
   end
 
   def _test_get__iter(http)

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r39463


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/