diff options
Diffstat (limited to 'lib/net/http.rb')
| -rw-r--r-- | lib/net/http.rb | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/lib/net/http.rb b/lib/net/http.rb index 37b6b82694..ddb4fe8c6a 100644 --- a/lib/net/http.rb +++ b/lib/net/http.rb @@ -1059,12 +1059,20 @@ module Net #:nodoc: # 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 |