From 46e293ec0d3a7b6522101d17bb44d76f2ba8b827 Mon Sep 17 00:00:00 2001 From: tenderlove Date: Sat, 3 Mar 2012 01:10:37 +0000 Subject: [PATCH] * lib/xmlrpc/client.rb (initialize): net/http defaults to 1_2 in 1.8+, so we can safely remove the call to enable it. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34886 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/xmlrpc/client.rb | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0379e95d5f6788..c0f0ce134ecf8a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Mar 3 10:09:21 2012 Aaron Patterson + + * lib/xmlrpc/client.rb (initialize): net/http defaults to 1_2 in 1.8+, + so we can safely remove the call to enable it. + Sat Mar 3 08:42:25 2012 Aaron Patterson * lib/xmlrpc/client.rb (new2): use URI for uri parsing. diff --git a/lib/xmlrpc/client.rb b/lib/xmlrpc/client.rb index e61d631b1690cc..d4123211d813f1 100644 --- a/lib/xmlrpc/client.rb +++ b/lib/xmlrpc/client.rb @@ -325,7 +325,6 @@ def initialize(host=nil, path=nil, port=nil, proxy_host=nil, proxy_port=nil, @proxy_port = @proxy_port.to_i if @proxy_port != nil # HTTP object for synchronous calls - Net::HTTP.version_1_2 @http = Net::HTTP.new(@host, @port, @proxy_host, @proxy_port) @http.use_ssl = @use_ssl if @use_ssl @http.read_timeout = @timeout