ruby.git/lib/uri, branch ruby_2_4 The Ruby Programming Language merge revision(s) 57359: [Backport #13442] 2017-05-09T14:28:21+00:00 nagachika nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e 2017-05-09T14:28:21+00:00 4a3da1fbba2c64d0fcb5da2fe7cc33b2bd808d0b uri/generic.rb: fix exception on non-IP format * lib/uri/generic.rb (URI::Generic#find_proxy): match IP address no_proxy against resolved self IP address. [Fix GH-1513] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@58624 b2dd03c8-39d4-4d8f-98ff-823fe69b080e 
	uri/generic.rb: fix exception on non-IP format

	* lib/uri/generic.rb (URI::Generic#find_proxy): match IP address
	  no_proxy against resolved self IP address.  [Fix GH-1513]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@58624 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 57411: [Backport #13147] 2017-03-11T17:55:02+00:00 naruse naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e 2017-03-11T17:55:02+00:00 21b241ab14e4f72207a0ccffa1a8bc3fc2603497 Fix typo of URI#escape [Bug #13147] patched by Steve Hill <sghill.dev@gmail.com> git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@57870 b2dd03c8-39d4-4d8f-98ff-823fe69b080e 
	Fix typo of URI#escape [Bug #13147]

	patched by Steve Hill <sghill.dev@gmail.com>

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@57870 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Use URI.decode_www_form_component [Bug #10774] 2016-12-12T15:24:28+00:00 naruse naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e 2016-12-12T15:24:28+00:00 6c0aece53d6fdfc890e35125dd3721ef2ff76d89 `parser` refered RFC2396_Parser, but it is separated. test is contributed by Dominik Menke git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57066 b2dd03c8-39d4-4d8f-98ff-823fe69b080e 
`parser` refered RFC2396_Parser, but it is separated.
test is contributed by Dominik Menke

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57066 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Use `&.` instead of `if` and `? :` 2016-11-22T23:44:51+00:00 kazu kazu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e 2016-11-22T23:44:51+00:00 5660bb929f6d9124cce46cd95f54fa0db30431ed git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56878 b2dd03c8-39d4-4d8f-98ff-823fe69b080e 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56878 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Update comment about default constant 2016-11-08T11:57:00+00:00 a_matsuda a_matsuda@b2dd03c8-39d4-4d8f-98ff-823fe69b080e 2016-11-08T11:57:00+00:00 41cc7eaa7ead04cc9abab57518f2aa3ff179428a Patch by: Dave Takahashi <dtcello@gmail.com> (@dtakahas) Signed-off-by: Akira Matsuda <ronnie@dio.jp> closes #1151 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56674 b2dd03c8-39d4-4d8f-98ff-823fe69b080e 
Patch by: Dave Takahashi <dtcello@gmail.com> (@dtakahas)
Signed-off-by: Akira Matsuda <ronnie@dio.jp>

closes #1151

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56674 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
uri/generic.rb: Tidy up merge 2016-10-31T02:08:54+00:00 nobu nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e 2016-10-31T02:08:54+00:00 587a24609bea4d7587510f614ac47fa56e7b246a * lib/uri/generic.rb (URI::Generic#merge): merge merge0. [GH-1469] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56528 b2dd03c8-39d4-4d8f-98ff-823fe69b080e 
* lib/uri/generic.rb (URI::Generic#merge): merge merge0.
  [GH-1469]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56528 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* lib/uri/common.rb: added documentation for deprecated method. 2016-10-20T08:03:01+00:00 hsbt hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e 2016-10-20T08:03:01+00:00 13e474f035aa7cc2ee8a1da177137d05eeec5e3b [Misc #11960][ruby-core:72733][ci skip] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56458 b2dd03c8-39d4-4d8f-98ff-823fe69b080e 
  [Misc #11960][ruby-core:72733][ci skip]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56458 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
forgot to replace two occurences of ENV. 2016-10-11T16:42:05+00:00 akr akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e 2016-10-11T16:42:05+00:00 a44f5878f212dba8a37c27a90be9aba9d0aec62a git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56397 b2dd03c8-39d4-4d8f-98ff-823fe69b080e 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56397 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Add an optional argument, env, to URI.find_proxy. 2016-10-11T07:53:56+00:00 akr akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e 2016-10-11T07:53:56+00:00 1ab0740838a5ff69ca6762817c9167cd1be741a5 * lib/uri/generic.rb (URI.find_proxy): Add an optional argument, env. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56392 b2dd03c8-39d4-4d8f-98ff-823fe69b080e 
* lib/uri/generic.rb (URI.find_proxy): Add an optional argument, env.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56392 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
uri/common.rb: Update URI::WEB_ENCODINGS_ [ci skip] 2016-10-06T02:04:28+00:00 nobu nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e 2016-10-06T02:04:28+00:00 a566bc0a38d103baf4598b73ed94bcfe021f6216 * lib/uri/common.rb (WEB_ENCODINGS_): split command lines and append a trailing comma. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56357 b2dd03c8-39d4-4d8f-98ff-823fe69b080e 
* lib/uri/common.rb (WEB_ENCODINGS_): split command lines and
  append a trailing comma.

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