diff options
| author | ayumin <ayumin@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-01-03 11:36:35 +0000 |
|---|---|---|
| committer | ayumin <ayumin@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-01-03 11:36:35 +0000 |
| commit | 1711e80cf16799ee84a75b0089807937e39fdbfe (patch) | |
| tree | de9e464387b0d313c37e5660f6eb72cb2ee4c8ba | |
| parent | e396ba84fb098812e52c6da9042e46b1ec17a82b (diff) | |
| download | ruby-1711e80cf16799ee84a75b0089807937e39fdbfe.tar.gz | |
Revert r49118 [Feature #10652]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49124 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/net/http.rb | 12 |
2 files changed, 2 insertions, 16 deletions
@@ -15,12 +15,6 @@ Sat Jan 3 18:19:50 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> * test/fiddle/test_cparser.rb: added type_alias test for parse_ctype and parse_struct_signature. -Sat Jan 3 16:02:20 2015 Ayumu AIZAWA <ayumu.aizawa@gmail.com> - - * 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@gmail.com> * ext/openssl/ossl.h: avoid to build failure of Windows environment. diff --git a/lib/net/http.rb b/lib/net/http.rb index ddb4fe8c6a..37b6b82694 100644 --- a/lib/net/http.rb +++ b/lib/net/http.rb @@ -1059,20 +1059,12 @@ module Net #:nodoc: # The proxy username, if one is configured def proxy_user - if @proxy_from_env then - proxy_uri && proxy_uri.user - else - @proxy_user - end + @proxy_user end # The proxy password, if one is configured def proxy_pass - if @proxy_from_env then - proxy_uri && proxy_uri.password - else - @proxy_pass - end + @proxy_pass end alias proxyaddr proxy_address #:nodoc: obsolete |