24528 Commits
Author SHA1 Message Date
usa 6968f3a0fd Revert previous commit because it was a mistake.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54690 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-04-22 09:10:34 +00:00
usa 54c011a92f merge revision(s) 54307: [Backport #12193]
* 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
2016-04-22 08:49:52 +00:00
usa 674725f1e8 * test/rubygems/test_gem_commands_environment_command.rb (test_execute):
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
2016-03-31 15:42:25 +00:00
usa ed3dedae1b * version.h: bump to 2.1.10. welcome to two-digit version!
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54456 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-03-31 15:01:07 +00:00
usa ee1a685178 merge revision(s) 53227: [Backport #11852]
* 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
2016-03-30 09:45:39 +00:00
usa 289889a654 merge revision(s) 54258: [Backport #12182]
* 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
2016-03-29 12:17:03 +00:00
usa 1a5d5856f5 merge revision(s) 54257: [Backport #12215]
* 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
2016-03-29 12:09:08 +00:00
usa bcccff509d merge revision(s) 54256: [Backport #12118] [Backport #12218]
* 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
2016-03-29 12:07:49 +00:00
usa d525dbd0d5 * ChangeLog: [ci skip] correct a mail address. cf. [Bug #11870]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54290 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-03-25 15:13:56 +00:00
usa a0c09867ab revert r54276 because of incompatibility.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54287 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-03-25 13:56:36 +00:00
usa b3f1ffd79b merge revision(s) 54231: [Backport #12121]
* variable.c: Added documentation about order of `Module#constants`
	  [ci skip][Bug #12121][ruby-dev:49505][fix GH-1301]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54285 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-03-25 09:42:52 +00:00
usa e4a39e0e9e merge revision(s) 54210: [Backport #12204]
* string.c (enc_succ_alnum_char): try to skip an invalid character
	  gap between GREEK CAPITAL RHO and SIGMA.
	  [ruby-core:74478] [Bug #12204]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54284 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-03-25 09:41:52 +00:00
usa df557d28ad merge revision(s) 54129,54130,54132: [Backport #11844]
* enc/trans/JIS: update Unicode's notice. [Bug #11844]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54283 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-03-25 09:39:56 +00:00
usa 32299d987b merge revision(s) 54097: [Backport #12069]
* ext/openssl/ossl_ssl.c (ossl_sslctx_setup): document as MT-unsafe
	  [ruby-core:73803] [Bug #12069]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54282 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-03-25 09:36:13 +00:00
usa 3e98a6494b merge revision(s) 54022: [Backport #11893]
* ext/tk/lib/tkextlib/tcllib/tablelist_tile.rb: fix method name typo.
	  [ruby-core:72513] [Bug #11893] The patch provided by Akira Matsuda.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54281 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-03-25 09:35:13 +00:00
usa f73e2f5321 merge revision(s) 54021: [Backport #11891]
* ext/tk/lib/tkextlib/tcllib/toolbar.rb: fix method name typo.
	  [ruby-core:72511] [Bug #11891] The patch provided by Akira Matsuda.
	  [ruby-core:72510] [Bug #11890] The patch provided by Akira Matsuda.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54280 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-03-25 09:34:26 +00:00
usa 5464a9474a merge revision(s) 54020: [Backport #11890]
* ext/tk/lib/tkextlib/blt/tree.rb: fix method name typo.
	[ruby-core:72510] [Bug #11890] The patch provided by Akira Matsuda.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54279 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-03-25 09:33:40 +00:00
usa ba94b8ce0f merge revision(s) 54018: [Backport #11886]
* ext/tk/lib/tk/menubar.rb: fix a typo in font name. [ruby-core:72505]
	  [Bug #11886] The patch provided by Akira Matsuda.

	* ext/tk/sample/*.rb: ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54278 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-03-25 09:32:49 +00:00
usa fb28e64342 merge revision(s) 53810: [Backport #12044]
* net/ftp.rb: add NullSocket#closed? to fix closing not opened
	  connection.  [Fix GH-1232]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54277 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-03-25 09:31:25 +00:00
usa facd02511b merge revision(s) 53949: [Backport #9810]
* numeric.c (num_step_scan_args): comparison String with Numeric
	  should raise TypeError. it is an invalid type, but not a
	  mismatch the number of arguments.  [ruby-core:62430] [Bug #9810]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54276 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-03-25 09:29:32 +00:00
usa 4e125b59e1 merge revision(s) 54172: [Backport #12192]
* parse.y (parse_numvar): NTH_REF must be less than a half of
	  INT_MAX, as it is left-shifted to be ORed with back-ref flag.
	  [ruby-core:74444] [Bug#12192] [Fix GH-1296]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54275 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-03-25 09:25:20 +00:00
usa 477c282a07 merge revision(s) 54105,54108,54136,54138: [Backport #12188]
* marshal.c (r_object0): Fix Marshal crash for corrupt extended object.

	* marshal.c (r_object0):  raise ArgumentError when linking to undefined
	  object.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54274 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-03-25 09:19:56 +00:00
usa d86cba89d8 merge revision(s) 46373: [Backport #9905]
* cont.c (rb_fiber_struct): keep context.uc_stack.ss_sp and context.uc_stack.ss_size
	  for later use. Patch by Rei Odaira. [ruby-core:62945] [Bug #9905]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54273 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-03-25 09:08:03 +00:00
usa d82440ff9c merge revision(s) 46108,46209,46223,46297,48223,48224: [Backport #12168]
* test/openssl: Join threads.

	* ext/openssl/ossl_ssl.c (ossl_ssl_close): Fix sync_close to work
	  when SSL is not started.
	  This fix the fd leak by test_https_proxy_authentication in
	  test/net/http/test_https_proxy.rb.

	* ext/openssl/lib/openssl/ssl.rb (SSLServer#accept): Close a socket
	  if any exception occur. 

	* test/ruby/envutil.rb (assert_join_threads): New assertion to
	  join multiple threads without exceptions.

	* test/openssl/utils.rb (start_server, server_loop): Use a
	  pipe to stop server instead of shutdown/close a listening socket.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54272 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-03-25 09:06:16 +00:00
usa 6827f86c51 merge revision(s) 54028: [Backport #12158]
* insns.def (opt_mod): show its method name on ZeroDivisionError.
	  [Bug #12158]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54271 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-03-25 08:48:04 +00:00
usa ce094d1d73 merge revision(s) 47837: [Backport #12155]
* test/ruby/test_process.rb (TestProcess#test_setsid): AIX
	  does not allow Process::getsid(pid) when pid is in a
	  different session.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54270 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-03-25 08:45:47 +00:00
usa 560c2da384 merge revision(s) 54010: [Backport #12154]
* test/ruby/test_process.rb (test_execopts_gid): Skip a test
	  that is known to fail on AIX. AIX allows setgid to
	  a supplementary group, but Ruby does not allow the "-e"
	  option when setgid'ed, so the test does not work as intended.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54269 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-03-25 08:43:45 +00:00
usa d76f465290 merge revision(s) 54004: [Backport #12152]
* test/rinda/test_rinda.rb (test_make_socket_ipv4_multicast):
	  The fifth argument to getsockopt(2) should be modified to
	  indicate the actual size of the value on return,
	  but not in AIX. This is a know bug. Skip related tests.

	* test/rinda/test_rinda.rb (test_ring_server_ipv4_multicast):
	  ditto.

	* test/rinda/test_rinda.rb (test_make_socket_unicast): ditto.

	* test/socket/test_basicsocket.rb (test_getsockopt): ditto.

	* test/socket/test_sockopt.rb (test_bool): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54268 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-03-25 08:41:11 +00:00
usa 6a7c313858 merge revision(s) 54002: [Backport #12151]
* test/zlib/test_zlib.rb (test_adler32_combine, test_crc32_combine):
	  Skip two tests on AIX because zconf.h in zlib does not correctly
	  recognize _LARGE_FILES in AIX. The problem was already reported
	  to zlib, and skip these tests until it is fixed.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54267 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-03-25 08:35:15 +00:00
usa 39301197fa merge revision(s) 54005: [Backport #12150]
* test/socket/test_addrinfo.rb (test_ipv6_address_predicates):
	  IN6_IS_ADDR_V4COMPAT and IN6_IS_ADDR_V4MAPPED are broken
	  on AIX, so skip related tests.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54266 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-03-25 08:34:04 +00:00
usa 09298fae6b merge revision(s) 51930: [Backport #12149]
* test/gdbm/test_gdbm.rb (TestGDBM#test_s_open_lock): skip
	  this test on AIX. The issue is the same as on Solaris.
	  [ruby-dev:47631]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54265 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-03-25 08:32:49 +00:00
usa c3ec5fd6da merge revision(s) 54000: [Backport #12148]
* thread_pthread.c (getstack): __pi_stacksize returned by
	  pthread_getthrds_np() is wrong on AIX. Use
	  __pi_stackend - __pi_stackaddr instead.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54264 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-03-25 08:28:28 +00:00
usa 26154da303 merge revision(s) 53943: [Backport #11969]
* lib/irb.rb: avoid to needless truncation when using back_trace_limit option.
	  [fix GH-1205][ruby-core:72773][Bug #11969]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54263 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-03-25 08:22:04 +00:00
usa 3208930512 merge revision(s) 53202: [Backport #11843]
* enc/windows_1250.c: Should not use C++ style comments (C99 feature).
	  [Bug #11843]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54262 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-03-25 08:19:14 +00:00
usa 25ce249db6 merge revision(s) 52883,52884,53046,53198: [Backport #11838]
* enc/iso_8859_4.c: Added missing lower/upper-case character
	  pair (U+014A and U+014B, LATIN CAPITAL/SMALL LETTER ENG)

	* enc/iso_8859_13.c: Added three missing lower/upper-case
	  character pairs (from Kimihito Matsui)
	  (from Kimihito Matsui)

	* enc/windows_1252.c: separate from ISO-8859-1 to fix 0x80..0x9e
	  range.  [ruby-core:64049] [Bug #10097]

	* enc/iso_8859_2.c, enc/windows_1250.c: separate Windows-1250
	  from ISO-8859-2 to fix 0x80..0x9e range (from Kimihito Matsui)


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54261 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-03-25 08:18:04 +00:00
usa 2703953ca6 merge revision(s) 49096,51353,53168,53169: [Backport #11834]
test_m17n.rb: split test_scrub

	* test/ruby/test_m17n.rb (TestM17N#test_scrub): split into some
  tests.
	* include/ruby/ruby.h: add raw FL macros, which assume always the
	  argument object is not a special constant.

	* internal.h (STR_EMBED_P, STR_SHARED_P): valid only for T_STRING.

	* string.c: deal with taint flags directly across String instances.

	* transcode.c (rb_econv_substr_append, econv_primitive_convert):
	  the result should be infected by the original string.

	* string.c (rb_str_scrub): the result should be infected by the
	  original string.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54260 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-03-25 08:13:18 +00:00
usa 4ef48a781a merge revision(s) 53790,53844: [Backport #12054]
* lib/logger.rb: Remove block from Logger.add as it's not needed
	  patch provided by Daniel Lobato Garcテュ [fix GH-1240] [Bug #12054]
	  patch provided by Daniel Lobato Garcia [fix GH-1240] [Bug #12054]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@53938 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-02-25 11:04:33 +00:00
usa b58ee6672d merge revision(s) 53784: [Backport #11495]
* re.c: Remove deprecated kcode argument from Regexp.new and compile
	  patch provided by Dylan Pulliam [Bug #11495]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@53937 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-02-25 11:00:43 +00:00
usa e41ee7cf33 merge revision(s) 53677: [Backport #11877]
* ext/socket/socket.c (sock_gethostname): support unlimited size
          hostname.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@53936 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-02-25 10:58:02 +00:00
usa abe1b00d16 merge revision(s) 53318: [Backport #11489]
* lib/xmlrpc/client.rb: Support SSL options in async methods of
	  XMLRPC::Client.
	  [Bug #11489]
	  Reported by Aleksandar Kostadinov. Thanks!!!


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@53935 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-02-25 10:29:39 +00:00
usa ca8b2d26f0 merge revision(s) 53609: [Backport #12011]
* marshal.c (r_object0): honor Marshal.load post proc
	  value for TYPE_LINK.  by Hiroshi Nakamura <nahi@ruby-lang.org>
	  https://github.com/ruby/ruby/pull/1204 fix GH-1204


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@53934 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-02-25 10:27:07 +00:00
usa e86d271d96 merge revision(s) 53561: [Backport #11958]
* ext/socket/option.c (sockopt_bool): relax boolean size to be one
	  too not only sizeof(int).  Winsock getsockopt() returns a single
	  byte as a boolean socket option.  [ruby-core:72730] [Bug #11958]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@53931 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-02-25 10:16:21 +00:00
usa 784005805c merge revision(s) 53346,53347,53348,53349,53391,53928: [Backport #11898]
* process.c: use rb_w32_uchdir() instead of plain chdir() on Windows.
	  reported by naruse via twitter.

	* process.c (rb_execarg_addopt): need to convert to ospath.

	* process.c (rb_execarg_parent_start1): need to convert the encoding to
          ospath's one.

	* process.c (rb_execarg_addopt): need to convert the encoding to
          ospath's one.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@53929 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-02-25 09:58:20 +00:00
usa cfdb3f5c26 merge revision(s) 53435: [Backport #11945]
* ext/stringio/stringio.c (strio_binmode): implement to set encoding

	* test/stringio/test_stringio.rb (test_binmode): new test
	  [ruby-core:72699] [Bug #11945]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@53927 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-02-25 09:23:15 +00:00
usa 2b0014ca25 merge revision(s) 53329: [Backport #11885]
* io.c (io_getpartial): remove unused kwarg from template

	* test/ruby/test_io.rb (test_readpartial_bad_args): new
	  [Bug #11885]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@53926 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-02-25 09:16:54 +00:00
usa 9c0d8283ec merge revision(s) 53299: [Backport #11870]
fix common misspelling [ci skip]

    compile.c, cont.c, doc, man: fix common misspelling. [Bug #11870]



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@53925 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-02-25 09:00:06 +00:00
usa af3ab0bb2c merge revision(s) 53259: [Backport #11862]
* ext/socket/init.c (rsock_init_sock): reject reserved FDs
	  [ruby-core:72445] [Bug #11862]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@53924 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-02-25 08:50:44 +00:00
usa c9eefd5644 merge revision(s) 53231,53244: [Backport #11854]
* ext/socket/init.c (rsock_init_sock): check FD after validating

	* test/socket/test_basicsocket.rb (test_for_fd): new
	  [ruby-core:72418] [Bug #11854]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@53923 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-02-25 08:45:12 +00:00
usa 734ac67206 merge revision(s) 53023: [Backport #11313]
* cont.c: fix a double word typo.
	  [Bug #11313][ruby-core:69749]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@53922 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-02-25 08:34:37 +00:00
usa d849db29b0 merge revision(s) 53022: [Backport #11764]
* ext/tk/lib/multi-tk.rb: fix typos.
	  [Bug #11764][ruby-core:71800]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@53921 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-02-25 08:33:15 +00:00