kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Revert r49118 [Feature #10652]

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49124 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ayumin 2015-01-03 11:36:35 +00:00
parent e396ba84fb
commit 1711e80cf1
2 changed files with 2 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -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 * test/fiddle/test_cparser.rb: added type_alias test for parse_ctype
and parse_struct_signature. 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> Sat Jan 3 11:50:16 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
* ext/openssl/ossl.h: avoid to build failure of Windows environment. * ext/openssl/ossl.h: avoid to build failure of Windows environment.

12
lib/net/http.rb
View file

@ -1059,20 +1059,12 @@ module Net #:nodoc:
# The proxy username, if one is configured # The proxy username, if one is configured
def proxy_user def proxy_user
if @proxy_from_env then @proxy_user
proxy_uri && proxy_uri.user
else
@proxy_user
end
end end
# The proxy password, if one is configured # The proxy password, if one is configured
def proxy_pass def proxy_pass
if @proxy_from_env then @proxy_pass
proxy_uri && proxy_uri.password
else
@proxy_pass
end
end end
alias proxyaddr proxy_address #:nodoc: obsolete alias proxyaddr proxy_address #:nodoc: obsolete