summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorayumin <ayumin@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-01-03 11:36:35 +0000
committerayumin <ayumin@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-01-03 11:36:35 +0000
commit1711e80cf16799ee84a75b0089807937e39fdbfe (patch)
treede9e464387b0d313c37e5660f6eb72cb2ee4c8ba /lib
parente396ba84fb098812e52c6da9042e46b1ec17a82b (diff)
Revert r49118 [Feature #10652]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49124 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/net/http.rb12
1 files changed, 2 insertions, 10 deletions
diff --git a/lib/net/http.rb b/lib/net/http.rb
index ddb4fe8..37b6b82 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