delta/ruby.git, branch ruby_2_1

* 2016-04-22

2016-04-22T09:10:35+00:00

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

Revert previous commit because it was a mistake.

2016-04-22T09:10:34+00:00

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

merge revision(s) 54307: [Backport #12193]

2016-04-22T08:49:52+00:00

	* lib/rubygems/test_case.rb: Fix test on Windows for inconsistent temp path.
	  https://github.com/rubygems/rubygems/pull/1554
	  [Bug #12193][ruby-core:74431]


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

* test/rubygems/test_gem_commands_environment_command.rb (test_execute):

2016-03-31T15:42:25+00:00

  version number may be two-digit.


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

* version.h: commit miss

2016-03-31T15:02:13+00:00

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

* version.h: bump to 2.1.10. welcome to two-digit version!

2016-03-31T15:01:07+00:00

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

merge revision(s) 53227: [Backport #11852]

2016-03-30T09:45:39+00:00

	* test/ruby/test_io.rb: handled rlimit value same as r52277
	  [Bug #11852][ruby-dev:49446]


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

merge revision(s) 54258: [Backport #12182]

2016-03-29T12:17:03+00:00

	* ext/openssl/extconf.rb: check SSL_CTX_set_next_proto_select_cb
	  function rather than OPENSSL_NPN_NEGOTIATED macro. it exists
	  even if it is disabled by OpenSSL configuration.
	  [ruby-core:74384] [Bug #12182]

	* ext/openssl/ossl_ssl.c: update #ifdef(s) as above.

	* test/openssl/test_ssl.rb: skip NPN tests if NPN is disabled.


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

merge revision(s) 54257: [Backport #12215]

2016-03-29T12:09:08+00:00

	* lib/uri/http.rb (URI::HTTP#initialize): [DOC] fix example,
	  missing mandatory arguments.  [ruby-core:74540] [Bug #12215]


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

merge revision(s) 54256: [Backport #12118] [Backport #12218]

2016-03-29T12:07:49+00:00

	* thread_pthread.c (reserve_stack): fix reserving position where
	  the stack growing bottom to top. [Bug #12118]


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