Revert r49118 [Feature #10652]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49124 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 2 insertions, 10 deletions

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