diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-22 08:54:43 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-22 08:54:43 +0000 |
| commit | 76ddadeb1ad5ba049efdd6463bf6169426127985 (patch) | |
| tree | 90280836dd49b06aae21fff9e2fa8cb30e00333b /lib | |
| parent | 330dccb9b444ec93660bf9e03fb7fa1b1c8619b8 (diff) | |
merge revision(s) 44637: [Backport #9385]
* 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/branches/ruby_2_1@45125 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/open-uri.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/open-uri.rb b/lib/open-uri.rb index 26eb1a364e..264c8501cf 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 |