ruby-changes:37037
From: ayumin <ko1@a...>
Date: Sat, 3 Jan 2015 16:22:14 +0900 (JST)
Subject: [ruby-changes:37037] ayumin:r49118 (trunk): * lib/net/http.rb (proxy_user): retrieve proxy user from http_proxy.
ayumin 2015-01-03 16:21:56 +0900 (Sat, 03 Jan 2015) New Revision: 49118 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=49118 Log: * lib/net/http.rb (proxy_user): retrieve proxy user from http_proxy. * lib/net/http.rb (proxy_pass): retrieve proxy password from http_proxy. Patch by Rafael dos Santos Silva. [fix GH-763] Modified files: trunk/ChangeLog trunk/lib/net/http.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 49117) +++ ChangeLog (revision 49118) @@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1 +Sat Jan 3 16:02:20 2015 Ayumu AIZAWA <ayumu.aizawa@g...> + + * lib/net/http.rb (Net::HTTP.proxy_user): retrieve proxy user from http_proxy. + * lib/net/http.rb (Net::HTTP.proxy_pass): retrieve proxy password from http_proxy. + Patch by Rafael dos Santos Silva. [fix GH-763] + Sat Jan 3 11:50:16 2015 SHIBATA Hiroshi <shibata.hiroshi@g...> * ext/openssl/ossl.h: avoid to build failure of Windows environment. Index: lib/net/http.rb =================================================================== --- lib/net/http.rb (revision 49117) +++ lib/net/http.rb (revision 49118) @@ -1059,12 +1059,20 @@ module Net #:nodoc: https://github.com/ruby/ruby/blob/trunk/lib/net/http.rb#L1059 # The proxy username, if one is configured def proxy_user - @proxy_user + if @proxy_from_env then + proxy_uri && proxy_uri.user + else + @proxy_user + end end # The proxy password, if one is configured def proxy_pass - @proxy_pass + if @proxy_from_env then + proxy_uri && proxy_uri.password + else + @proxy_pass + end end alias proxyaddr proxy_address #:nodoc: obsolete -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/