knu	2011-01-05 13:58:57 +0900 (Wed, 05 Jan 2011)

  New Revision: 30452

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

  Log:
    * lib/net/http.rb (Net::HTTP#get): A header hash given should not
      be modified.

  Modified files:
    trunk/ChangeLog
    trunk/lib/net/http.rb
    trunk/test/net/http/test_http.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 30451)
+++ ChangeLog	(revision 30452)
@@ -1,3 +1,8 @@
+Wed Jan  5 13:56:54 2011  Akinori MUSHA  <knu@i...>
+
+	* lib/net/http.rb (Net::HTTP#get): A header hash given should not
+	  be modified.
+
 Wed Jan  5 13:56:03 2011  Aaron Patterson <aaron@t...>
 
 	* SSL_shutdown should be called until the return value is non-zero:
Index: lib/net/http.rb
===================================================================
--- lib/net/http.rb	(revision 30451)
+++ lib/net/http.rb	(revision 30452)
@@ -987,7 +987,9 @@
       res = nil
       if HAVE_ZLIB
         unless  initheader.keys.any?{|k| k.downcase == "accept-encoding"}
-          initheader["accept-encoding"] = "gzip;q=1.0,deflate;q=0.6,identity;q=0.3"
+          initheader = initheader.merge({
+            "accept-encoding" => "gzip;q=1.0,deflate;q=0.6,identity;q=0.3"
+          })
           @compression = true
         end
       end
Index: test/net/http/test_http.rb
===================================================================
--- test/net/http/test_http.rb	(revision 30451)
+++ test/net/http/test_http.rb	(revision 30452)
@@ -42,6 +42,10 @@
     assert_equal $test_net_http_data_type, res['Content-Type']
     assert_equal $test_net_http_data.size, res.body.size
     assert_equal $test_net_http_data, res.body
+
+    assert_nothing_raised {
+      res, body = http.get('/', { 'User-Agent' => 'test' }.freeze)
+    }
   end
 
   def _test_get__iter(http)

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