* 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
This commit is contained in:
parent
aef778b4e7
commit
24a52978d4
@ -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>
|
Fri Jan 17 20:05:02 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
* lib/delegate.rb (Delegator): keep source information methods
|
* lib/delegate.rb (Delegator): keep source information methods
|
||||||
|
@ -288,7 +288,7 @@ module OpenURI
|
|||||||
end
|
end
|
||||||
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
|
if target.class == URI::HTTPS
|
||||||
require 'net/https'
|
require 'net/https'
|
||||||
http.use_ssl = true
|
http.use_ssl = true
|
||||||
|
Loading…
x
Reference in New Issue
Block a user