ayumin	2015-01-03 20:36:35 +0900 (Sat, 03 Jan 2015)

  New Revision: 49124

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=49124

  Log:
    Revert r49118 [Feature #10652]

  Modified files:
    trunk/ChangeLog
    trunk/lib/net/http.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 49123)
+++ ChangeLog	(revision 49124)
@@ -15,12 +15,6 @@ Sat Jan  3 18:19:50 2015  SHIBATA Hirosh https://github.com/ruby/ruby/blob/trunk/ChangeLog#L15
 	* 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@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 49123)
+++ lib/net/http.rb	(revision 49124)
@@ -1059,20 +1059,12 @@ 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
-      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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/