6905 Commits
Author SHA1 Message Date
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 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 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 2d5e2cc289 * test/openssl/utils.rb (start_server): check nil.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54286 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-03-25 13:53:29 +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 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 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 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 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 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 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 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 bf524be10c merge revision(s) 53167: [Backport #11825]
* re.c (reg_names_iter): should consider encoding of regexp.
	  [ruby-core:72185] [Bug #11825]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@53920 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-02-25 07:48:31 +00:00
usa 339e11a7f1 merge revision(s): 53153 and 23405@ruby_1_9_1
* ext/fiddle/handle.c: check tainted string arguments.
	  Patch provided by tenderlove and nobu.

	* test/fiddle/test_handle.rb (class TestHandle): add test for above.

	* ext/dl/handle.c (rb_dlhandle_initialize): prohibits DL::dlopen
	  with a tainted name of library.
	  Patch by sheepman <sheepman AT sheepman.sakura.ne.jp>.

	* ext/dl/handle.c (rb_dlhandle_sym): ditto



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@53156 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-16 12:15:26 +00:00
usa 7abafeb92d merge revision(s) 53083: [Backport #11823]
* io.c (parse_mode_enc): fix buffer overflow.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@53148 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-16 07:14:32 +00:00
usa 703a24a947 merge revision(s) 53039: [Backport #11804]
* insns.def (opt_case_dispatch): avoid converting Infinity

	* test/ruby/test_optimization.rb (test_opt_case_dispatch_inf): new
	  [ruby-dev:49423] [Bug #11804]'


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@53147 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-16 07:11:41 +00:00
usa 67ec7b5391 merge revision(s) 52928: [Backport #11784]
* insns.def (opt_case_dispatch): check Float#=== redefinition

	* test/ruby/test_optimization.rb (test_opt_case_dispatch): new
	  [ruby-core:71920] [Bug #11784]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@53145 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-16 07:06:02 +00:00
usa f0680bdee8 merge revision(s) 52856,52906: [Backport #11760]
* encoding.c (enc_m_loader): defer finding encoding object not to
	  be infected by marshal source.  [ruby-core:71793] [Bug #11760]

	* marshal.c (r_object0): enable compatible loader on USERDEF
	  class.  the loader function is called with the class itself,
	  instead of an allocated object, and the loaded data.

	* marshal.c (compat_allocator_table): intialize
	  compat_allocator_tbl on demand.

	* object.c (rb_undefined_alloc): extract from rb_obj_alloc.

	* marshal.c (compat_allocator_table): initialize


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@52933 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-08 02:51:38 +00:00
usa 0399a3d47b merge revision(s) 52868: [Backport #11767]
* range.c (range_to_s): should be infected by the receiver.
	  str2 infects by appending.  [ruby-core:71811] [Bug #11767]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@52875 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-04 01:56:19 +00:00
usa f81b6694ed merge revision(s) 51583,51594,51638: [Backport #11444]
* io.c (rb_io_each_codepoint): read more data when read partially.
	  [ruby-core:70379] [Bug #11444]

	* io.c (rb_io_each_codepoint): raise an exception at incomplete
	  character before EOF when conversion takes place.  [Bug #11444]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@52831 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-01 08:00:58 +00:00
usa 99bcf86ec3 merge revision(s) 50737: [Backport #11211]
* insns.def (defined): skip respond_to_missing? when
	  a method is available.
	  [Bug #11211]

	* test/ruby/test_defined.rb: add a test for this fix.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@52802 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-11-30 12:34:23 +00:00
usa 6602bc193b merge revision(s) 52745: [Backport #11738]
* io.c (argf_getpartial): should not resize str if the second
	  argument is not given.
	  [ruby-core:71668] [Bug #11738]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@52800 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-11-30 12:19:43 +00:00
usa 0f5bf06726 merge revision(s) 52683,52684: [Backport #11719] [Backport #11722]
* lib/net/http.rb: Fixed regression for Net::HTTP::PUT with "Expect-100"
	  header.

	* test/net/http/test_http.rb: added test.

	* Added missing reference of GitHub
	  header. [fix GH-949]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@52796 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-11-30 11:56:05 +00:00
usa 936a27758f merge revision(s) 51722,51724: [Backport #11376]
* ext/openssl/ossl_ssl.c (static const struct): Only add SSLv3 support
	  if the SSL library supports it.  Thanks Kurt Roeckx <kurt@roeckx.be>
	  [Bug #11376]

	* ext/openssl/extconf.rb: check for SSLv3 support in the SSL
	  implementation.

	* test/openssl/test_ssl.rb (class OpenSSL): Skip tests that need SSLv3
	  if there is no support.

	* ext/openssl/ossl_ssl.c (ossl_ssl_method_tab): Only add SSLv3 support


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@52642 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-11-18 11:34:19 +00:00
usa 9f8d00ff9a merge revision(s) 48609: [Backport #10449] [Backport #11651]
* compile.c (iseq_compile_each): remove duplicated line event.
	  [Bug #10449]

	* test/ruby/test_settracefunc.rb: add and fix tests.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@52640 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-11-18 11:24:36 +00:00
usa bc090868b8 merge revision(s) 51713: [Backport #11492] [Backport #11646]
* vm.c (hook_before_rewind): prevent kicking :return event while
	  finishing vm_exec func because invoke_block_from_c() kick a :return
	  event for bmethods.
	  [Bug #11492]

	* test/ruby/test_settracefunc.rb: add a test.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@52639 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-11-18 11:17:54 +00:00
usa 69e671aa96 merge revision(s) 51569,51649: [Backport #11367]
test_ssl_session.rb: check SSL method

	* test/openssl/test_ssl_session.rb (test_ctx_server_session_cb):
  ensure the method to be tested is supported.
	* test/openssl/test_ssl_session.rb: Fix tests so that they take in to
	  account OpenSSL installations that have SSLv3 disabled by default.
	  Thanks Jeremy Evans <code@jeremyevans.net> for the patches.
	  [Bug #11366] [Bug #11367]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@52638 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-11-18 11:13:07 +00:00
usa 7e9ce9f5d6 merge revision(s) 49099: [Backport #10046]
* test/openssl/test_ssl_session.rb (OpenSSL#test_ctx_client_session_cb):
	  fix test failure with OpenSSL disabled SSLv3 protocol.
	  [ruby-core:63772] [Bug #10046]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@52637 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-11-18 11:08:17 +00:00
usa a4e761b765 merge revision(s) 52244: [Backport #11513]
* lib/ipaddr.rb, test/test_ipaddr.rb: Reject invalid address contained
	  EOL string. Patch by @kachick [fix GH-942][Bug #11513]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@52360 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-10-29 14:36:05 +00:00
usa ba3b4e0a69 merge revision(s) 52229,52273,52277,52357: [Backport #11613]
Add rlimit_nproc to avoid to create many process [Bug #11613]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@52358 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-10-29 14:28:16 +00:00
usa 694463ba9b merge revision(s) 51916: [Backport #11543]
* test/drb/test_drb.rb: Run Rinda/DRb tests on localhost. [Fix GH-1027]
	  patch by voxik.

	* test/rinda/test_rinda.rb: ditto


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@52353 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-10-29 13:54:43 +00:00
usa d3fb88d09a merge revision(s) 51820: [Backport #11519]
* parse.y (literal_concat_gen, evstr2dstr_gen): keep literal
	  encoding beginning with an interpolation same as the source file
	  encoding.  [ruby-core:70703] [Bug #11519]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@51978 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-09-29 08:40:40 +00:00
usa 4a4a83c981 merge revision(s) 51766,51767: [Backport #11509]
* lib/rss/rss.rb (Time#w3cdtf): fix zero-trimmed width of fraction
	  digits.  [ruby-core:70667] [Bug #11509]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@51977 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-09-29 08:34:18 +00:00
usa d69ae6f985 merge revision(s) 51685: [Backport #11488]
* re.c (rb_memsearch_wchar, rb_memsearch_qchar): test matching
	  till the end of string.  [ruby-core:70592] [Bug #11488]

	* test/ruby/test_m17n.rb (test_include?, tet_index): add tests by
	  Tom Stuart.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@51976 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-09-29 08:30:33 +00:00
usa 9ce1bf8f3d merge revision(s) 50829: [Backport #11248]
* lib/rubygems.rb: bump version to 2.4.5.1. this version fixed
  CVE-2015-3900.

* lib/rubygems/remote_fetcher.rb: ditto.

* test/rubygems/test_gem_remote_fetcher.rb: added testcase for CVE-2015-3900



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@51627 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-08-18 12:56:58 +00:00
usa 26eb8e4b4e merge revision(s) 51470: [Backport #11413]
* re.c (rb_memsearch): should match only char boundaries in wide
	  character encodings.  [ruby-core:70220] [Bug #11413]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@51615 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-08-17 08:58:50 +00:00