From 24a52978d4e2fe59cfa57c216c1118dce5f81640 Mon Sep 17 00:00:00 2001 From: akr Date: Sat, 18 Jan 2014 12:20:31 +0000 Subject: [PATCH] * lib/open-uri.rb: Make proxy disabling working again. Fixed by Christophe Philemotte. [ruby-core:59650] [Bug #9385] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44637 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/open-uri.rb | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f0ff5802be..c036ddc43b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Jan 18 21:19:04 2014 Tanaka Akira + + * lib/open-uri.rb: Make proxy disabling working again. + Fixed by Christophe Philemotte. [ruby-core:59650] [Bug #9385] + Fri Jan 17 20:05:02 2014 Nobuyoshi Nakada * lib/delegate.rb (Delegator): keep source information methods diff --git a/lib/open-uri.rb b/lib/open-uri.rb index 86aa0f1887..82339ed473 100644 --- a/lib/open-uri.rb +++ b/lib/open-uri.rb @@ -288,7 +288,7 @@ module OpenURI end end - http = klass.new(target_host, target_port) + http = proxy ? klass.new(target_host, target_port) : klass.new(target_host, target_port, nil) if target.class == URI::HTTPS require 'net/https' http.use_ssl = true