summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authordrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-02-24 06:19:29 +0000
committerdrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-02-24 06:19:29 +0000
commitfaa9fb59e3541be1c83d17c3bc76536ced1839af (patch)
treefb58362e20d142180a5254a9d2786bff095971f0 /lib
parent495d8b0ec350ece15bc5d975a3cb29481745bc79 (diff)
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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39464 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/net/http.rb7
1 files changed, 0 insertions, 7 deletions
diff --git a/lib/net/http.rb b/lib/net/http.rb
index cc1b1c4a1f..4cb0408139 100644
--- a/lib/net/http.rb
+++ b/lib/net/http.rb
@@ -1122,13 +1122,6 @@ module Net #:nodoc:
#
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