diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-01-18 12:20:31 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-01-18 12:20:31 +0000 |
commit | 24a52978d4e2fe59cfa57c216c1118dce5f81640 (patch) | |
tree | 4f6a42c6e80e4755cf3c1e0d0f292f47f8408ec4 | |
parent | aef778b4e76e768941a790a5e8370b86ec6ac27f (diff) | |
download | ruby-24a52978d4e2fe59cfa57c216c1118dce5f81640.tar.gz |
* 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
-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 |