summaryrefslogtreecommitdiff
path: root/test
AgeCommit message (Collapse)Author
2015-08-17merge revision(s) 50829: [Backport #11248]nagachika
* 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_2@51619 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-08-15merge revision(s) 51470: [Backport #11413]nagachika
* 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_2@51590 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-08-14merge revision(s) 51116: [Backport #11324]nagachika
* transcode.c (rb_econv_set_replacement): target encoding name can be empty now. [ruby-core:69841] [Bug #11324] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@51573 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-08-14merge revision(s) 51423,51425: [Backport #9381]nagachika
test_hash.rb: add assertions * test/ruby/test_hash.rb (test_wrapper_of_special_const): test other special obejcts. [Bug #9381] * hash.c (rb_any_hash): fix Float hash. rb_dbl_hash() returns a Fixnum, but not a long. [Bug #9381] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@51572 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-08-14merge revision(s) 50339,50340,50342,50343: [Backport #10705]nagachika
parser.rl: use StringValue * ext/json/parser/parser.rl (cParser_initialize): use StringValue instead of direct rb_convert_type and remove duplicate conversion. * ext/json/parser/parser.rl: raise with messages in UTF-8 encoding. [ruby-core:67386] [Bug #10705] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@51571 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-08-13merge revision(s) 51066: [Backport #11319]nagachika
* io.c (rb_io_oflags_modestr): handle O_TRUNC correctly * test/ruby/test_io.rb (test_reopen_stdio): new test Patch-by: cremno phobia <cremno@mail.ru> [ruby-core:69779] [Bug #11319] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@51568 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-08-12merge revision(s) 51046: [Backport #11260]nagachika
* lib/net/ftp.rb (makeport): close the TCPServer when sending the port fails. * test/net/ftp/test_ftp.rb: test for above. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@51556 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-08-12merge revision(s) 51464,51465: [Backport #11058]nagachika
* lib/net/http/response.rb (Net::HTTPResponse#inflater): fix TypeError. An exception object might be nil. [ruby-core:68846] [Bug #11058] * lib/net/http/response.rb (Net::HTTPResponse::Inflater#finish): fix a bug that empty gzipped response body causes Zlib::BufError. [ruby-core:68846] [Bug #11058] * test/net/http/test_httpresponse.rb: tests for the above. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@51555 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-08-12merge revision(s) 51409,51453: [Backport #10910]nagachika
* ext/openssl/lib/openssl/ssl.rb (module OpenSSL): raise a more helpful exception when verifying the peer connection and an anonymous cipher has been selected. [ruby-core:68330] [Bug #10910] Thanks to Chris Sinjakli <chris@sinjakli.co.uk> for the patch. * test/openssl/test_ssl.rb (class OpenSSL): test for change * .travis.yml: update libssl before running tests. Thanks to Chris Sinjakli <chris@sinjakli.co.uk> for figuring out the travis settings! git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@51554 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-08-12merge revision(s) 51202,51203,51204: [Backport #11340]nagachika
* win32/win32.c (waitpid): return immediately if interrupted. reported by <takkanm AT gmail.com> [ruby-dev:49176] [Bug #11340] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@51552 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-08-11merge revision(s) 51531: [Backport #11368]nagachika
* test/openssl/test_ssl.rb: Fix LocalJumpErrors being raised in OpenSSL tests. [ruby-core:70020][Bug #11368] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@51536 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-08-10merge revision(s) 51213: [Backport #11344]nagachika
* lib/timeout.rb (ExitException): removed internal exception class and use Timeout::Error instead, as using throw/catch to isolate each timeouts now. [ruby-dev:49179] [Bug #11344] * lib/timeout.rb (ExitException): leave Timeout::ExitException as an alias of Timeout::Error for backward compatibility in stable branch. [ruby-dev:49179] [Bug #11344] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@51523 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-08-10merge revision(s) 51061,51063,51091: [Backport #11285]nagachika
* lib/net/http/response.rb (inflater): CONTENT_ENCODING can be upper case. [ruby-core:69670] [Bug #11285] patched by Andy Chu * test/net/http/test_httpresponse.rb (HTTPResponseTest#test_read_body_content_encoding_deflate_uppercase): fix a failure without zlib. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@51522 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-08-10merge revision(s) 51263,51264: [Backport #11352]nagachika
* vm.c (m_core_hash_merge_ptr): copy the arguments to the machine stack before rewinding the control frame pointer and leaving the arguments outside valid region of the value stack. [ruby-core:69969] [Bug #11352] * vm.c (REWIND_CFP): keep the arguments region inside the valid value stack. [ruby-core:69969] [Bug #11352] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@51521 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-08-10merge revision(s) 51344: [Backport #11387]nagachika
* string.c (rb_str_reverse): reversed string is not a substring, and should not set coderange of the original string. [ruby-dev:49189] [Bug #11387] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@51520 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-08-10merge revision(s) 51350: [Backport #11380] [Backport #11389]nagachika
* parse.y (lambda_body): pop cmdarg stack for lookahead token. [ruby-core:70067] [Bug #11380] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@51519 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-08-03merge revision(s) 49788,49790: [Backport #10904]nagachika
* lib/time.rb (strptime): Support %s.%N. [ruby-core:68301] [Bug #10904] Patch by Sadayuki Furuhashi. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@51475 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-08-03merge revision(s) 51037: [Backport #11277]nagachika
* transcode.c (load_transcoder_entry): fix transcoder loading race condition, by waiting in require. [ruby-dev:49106] [Bug #11277] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@51474 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-08-03merge revision(s) 50827,50921: [Backport #11235]nagachika
* array.c (ary_ensure_room_for_push): check if array size will exceed maxmum size to get rid of buffer overflow. [ruby-dev:49043] [Bug #11235] * array.c (ary_ensure_room_for_unshift, rb_ary_splice): ditto. exceed maximum size to get rid of buffer overflow. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@51473 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-07-04merge revision(s) 50887,50896,50902: [Backport #11060]nagachika
* file.c (rb_file_load_ok): try opening file without gvl not to lock entire process. [Bug #11060] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@51143 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-07-03merge revision(s) 50671: [Backport #11192]nagachika
* compile.c (iseq_compile_each): out of range NTH_REF is always nil. * parse.y (parse_numvar): check overflow of NTH_REF and range. [ruby-core:69393] [Bug #11192] * util.c (ruby_scan_digits): make public and add length parameter. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@51134 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-07-03merge revision(s) 50430,50440: [Backport #11117]nagachika
* vm_eval.c (rb_method_call_status): undefined refined method is not callable unless using. [ruby-core:69064] [Bug #11117] * vm_eval.c (rb_method_call_status): resolve refined method entry to check if undefined. [ruby-core:69064] [Bug #11117] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@51133 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-07-03merge revision(s) 50972:nagachika
test_gem_remote_fetcher.rb: get rid of errors * test/rubygems/test_gem_remote_fetcher.rb (start_ssl_server): temporary measure for "dh key too small" error of OpenSSL 1.0.2c+. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@51131 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-07-03merge revision(s) 50366: [Backport #11045]nagachika
* test/ruby/test_m17n_comb.rb: test_str_crypt split into strict and non-strict versions to allow masking out non-strict when glibc version cannot be determined (#11045). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@51130 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-07-03merge revision(s) 50850: [Backport #11254]nagachika
vm.c: break from orphan block * vm.c (rb_vm_search_cf_from_ep): break from orphan block is possible condition, but not [BUG]. [ruby-core:69548] [Bug #11254] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@51129 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-06-27merge revision(s) 50982,50983: [Backport #11291]nagachika
* ext/objspace/objspace_dump.c(dump_object): Return empty JSON object when passed object is a special const, instead of SEGV. Based patch by Kohei Suzuki (eagletmt). [ruby-core:69692] [Bug #11291] * test/objspace/test_objspace.rb(test_dump_special_consts): Test for above fix. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@51047 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-06-16test/objsace/test_objspace.rb: revert partially r50923.nagachika
I accidentally insert GC.start. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50924 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-06-16merge revision(s) 50914,50915: [Backport #10852]nagachika
* test/objspace/test_objspace.rb (test_dump_flags): relax pattern because long_lived flag and marked flag can be false at major GC. [Bug #10852] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50923 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-06-11merge revision(s) 50515: [Backport #11155]nagachika
* load.c (loaded_feature_path): stop returning false negatives for filenames which are trailing substrings of file extensions. For example, 'b', which a trailing substring of ".rb" should not return false. [Bug #11155][ruby-core:69206] * test/ruby/test_autoload.rb: test for fix git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50835 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-05-23merge revision(s) 50057,50065: [Backport #10991]nagachika
* marshal.c (r_symreal): register symbol names as strings first so that r_symlink always returns valid names. [ruby-core:68587] [Bug #10991] * marshal.c (r_ivar, r_object0): now need to intern symbol names. * marshal.c (r_object0): compare with symbol names. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50632 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-05-23merge revision(s) 50421: [Backport #11113]nagachika
* range.c (linear_object_p, range_include): test if covered for linear objects. [ruby-core:69052] [Bug #11113] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50630 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-05-23merge revision(s) 50444: [Backport #11128]nagachika
* lib/net/imap.rb (body_ext_mpart): should work even if body-fld-dsp is omitted. [ruby-core:69093] [Bug #11128] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50629 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-05-23merge revision(s) 50206: [Backport #10724]nagachika
* vm.c (vm_exec): check other events when RETURN is thrown. [Bug #10724] * test/ruby/test_settracefunc.rb: add a test. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50624 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-05-23merge revision(s) 50187,50202: [Backport #11051]nagachika
* ext/socket/raddrinfo.c (addrinfo_mload): fix memory leak of addrinfo. [ruby-dev:48923] [Bug #11051] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50623 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-05-23merge revision(s) 50182,50183: [Backport #11035]nagachika
* hash.c (rb_any_hash): Symbols are compared by the identities always. [ruby-core:68767] [Bug #11035] * test/ruby/test_symbol.rb: fix syntax error. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50620 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-05-23merge revision(s) 49999,50000: [Backport #10979]nagachika
* hash.c (rb_any_hash): use same hash values with Float#hash so that -0.0 and +0.0 will be identical. [ruby-core:68541] [Bug #10979] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50619 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-05-20merge revision(s) 50172,50173: [Backport #11027]nagachika
* vm_args.c: protect value stack from calling other methods during complex parameter setting process (splat, kw, and so on). [Bug #11027] * vm_core.h: remove rb_thead_t::mark_stack_len. With this modification, we don't need to use th->mark_stack_len. * test/ruby/test_keyword.rb: add a test. * cont.c (cont_capture): catch up this fix. * vm.c (rb_thread_mark): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50562 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-05-20merge revision(s) 50372,50373: [Backport #11086]nagachika
* vm_eval.c (rb_obj_instance_eval, rb_obj_instance_exec): allow symbols to just instance_eval/exec, except for definition of singletons. [ruby-core:68961] [Bug #11086] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50561 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-05-19merge revision(s) 50334,50337: [Backport #10942]nagachika
* string.c (STR_SET_EMBED): clear NOFREE flag at embedding as embedded strings no longer refer static strings. [ruby-core:68436] [Bug #10942] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50550 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-05-19merge revision(s) 49922,50111,50112: [Backport #11012]nagachika
* proc.c: use RUBY_VM_IFUNC_P() to recognize IFUNC or not. * vm.c: ditto. * vm_dump.c: ditto. * vm_insnhelper.c: ditto. * vm_core.h: use RB_TYPE_P() instead of BUILTIN_TYPE(). * proc.c (proc_binding): replicate env from method object, and allocate the local variable area for the iseq local table. [ruby-core:68673] [Bug #11012] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50548 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-05-19merge revision(s) 50038: [Backport #10985]nagachika
* proc.c (respond_to_missing_p): check if the receiver responds to the given method by respond_to_missing?. * proc.c (mnew_missing): create Method object for method_missing. [ruby-core:68564] [Bug #10985] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50546 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-05-19merge revision(s) 49859,49861,49865: [Backport #10941] [Backport #10978] ↵nagachika
[Backport #11089] * dir.c (replace_real_basename): shouldn't create Ruby object before the object system is loaded. [ruby-core:68430] [Bug #10941] * dir.c (replace_real_basename): need to check the return value of GLOB_REALLOC(). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50545 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-05-19merge revision(s) 49095: [Backport #11150]nagachika
* lib/resolv.rb (Resolv::DNS::Label::Str#==): Check class equality. (Resolv::DNS::Name#initialize): Normalize labels as Resolv::DNS::Label::Str objects. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50544 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-05-19merge revision(s) 50541,50542: [Backport #11159]nagachika
* iseq.c (rb_iseq_compile_with_option): check srouce type, must be an IO or a String. [ruby-core:69219] [Bug #11159] * iseq.c (rb_iseq_compile_with_option): check source type, must be git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50543 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-05-13merge revision(s) 50402: [Backport #11107]nagachika
* parse.y (lambda): push and reset cmdarg_stack in lambda body. [ruby-core:69017] [Bug #11107] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50487 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-05-13merge revision(s) 50141: [Backport #11021]nagachika
* lib/fileutils.rb (FileUtils#mv): show the exact target path in the error message instead of the destination parent directory name. patched by Joao Britto <jabcalves AT gmail.com> at [ruby-core:68706]. [Bug #11021] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50485 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-04-13merge revision(s) 50292: [Backport #9644]nagachika
* ext/openssl/lib/openssl/ssl.rb: stricter hostname verification following RFC 6125. with the patch provided by Tony Arcieri and Hiroshi Nakamura [ruby-core:61545] [Bug #9644] * test/openssl/test_ssl.rb: add tests for above. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50293 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-04-12merge revision(s) 49964,50265: [Backport #11047] [Backport #10957]nagachika
* parse.y (primary): empty parentheses at cmdarg can be null. [ruby-core:68477] [Bug #10957] * parse.y (arg): fix segfault by null caused by syntax error. [ruby-core:68851] [Bug #10957] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50277 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-04-12merge revision(s) 49797: [Backport #10923]nagachika
* ext/io/wait/wait.c (io_nread): wrap return value with INT2FIX Thanks to Yura Sokolov <funny.falcon@gmail.com> [ruby-core:68369] [Bug#10923] * test/io/wait/test_io_wait.rb (test_nread_buffered): fix broken test git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50276 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-04-12merge revision(s) 49867: [Backport #10847] [Backport #10970]nagachika
* vm_eval.c (vm_call_super): search next super class from the original class, to get rid of infinite recursion with prepending. a patch by Seiei Higa <hanachin AT gmail.com> at [ruby-core:68434]. [ruby-core:68093] [Bug #10847] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50275 b2dd03c8-39d4-4d8f-98ff-823fe69b080e