diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/open-uri.rb | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Sat Jan 18 21:19:04 2014 Tanaka Akira <akr@fsij.org> + + * 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 <nobu@ruby-lang.org> * 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 |