summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-10-27merge revision(s) 52124: [Backport #11591]nagachika
* configure.in: check for libunwind.h, which is not available in very old OS X SDK. [ruby-core:71080] [Bug #11591] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52307 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-10-27merge revision(s) 51916: [Backport #11543]nagachika
* 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_2@52305 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-10-05merge revision(s) 50409,51616,51617,51624: [Backport #10653] [Backport #11456]nagachika
parse.y: %-string cannot be a label * parse.y (parser_yylex): %-string cannot be a label even if terminated by single/double quotes. * parse.y: fix syntax error at do-block after a conditional operator. separate label-allowed and after-a-label states from others as bit flags. [ruby-dev:48790] [Bug #10653] * parse.y (IS_BEG): include labeled argument state, which was EXPR_LABELARG. [ruby-dev:49221] [Bug #11456] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52046 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-10-04merge revision(s) 52026: [Backport #11471]nagachika
* enum.c (nmin_filter): Fix limit value. patch by Helder Pereira. [Bug #11471] [ruby-core:70477] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52032 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-09-29merge revision(s) 51766,51767: [Backport #11509]nagachika
* 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_2@51987 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-09-29merge revision(s) 51685,51821: [Backport #11488]nagachika
* 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. * test/ruby/test_m17n.rb (test_include?, test_index): add tests by git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@51986 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-09-29merge revision(s) 51626: [Backport #11457]nagachika
* thread_pthread.c (reserve_stack): ensure the memory is really allocated. [Bug #11457] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@51985 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-08-24* insns.def (defineclass): introduce an ad-hoc patch to avoidnagachika
an issue reported on [Bug #10871]. This patch does not fix completely. For example, method definition in a block (like 1.times{def ...; end}) still causes same issue. To solve all, we need a huge patch and it seems difficult for stable branch. Use Ruby 2.3 and later to solve this issue completely. (See [Bug #10943]) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@51673 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-08-18bump version to 2.2.4.nagachika
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@51637 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-08-18merge revision(s) 49014:nagachika
* tool/downloader.rb: support old versions of ruby. * tool/downloader.rb: now can download gems by http if openssl is not available (this may be danger!) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@51635 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-08-18merge revision(s) 51534:nagachika
* numeric.c (Init_Numeric): Fix document for Float::MIN and Float::EPSILON. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@51625 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
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-17merge revision(s) 51575,51584: [Backport #11439]nagachika
* ext/win32/lib/win32/registry.rb (API#SetValue): add terminator size, not 1 byte. [ruby-core:70365] [Bug #11439] * ext/win32/lib/win32/registry.rb (API#SetValue): data size should be in bytes, not in chars. [ruby-core:70365] [Bug #11439] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@51618 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-15merge revision(s) 51410: [Backport #11396]nagachika
* symbol.h (struct RSymbol): add hashval field * symbol.c (dsymbol_alloc): setup hashval field once * hash.c (rb_any_hash): return RSymbol->hashval directly * common.mk: hash.o depends on symbol.h Thanks to Bruno Escherl <bruno@escherl.net> for the bug report [ruby-core:70129] [Bug #11396] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@51589 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) 50104,50105: [Backport #10906]nagachika
* ext/date/extconf.rb: try_cflags("-std=iso9899:1999") [Bug #10906] ruby itself (including numeric.c) is built with strict compile options including -std=iso9899:1999, but ext/date is not. By the way -std=iso9899:1999 is not only a warning option but also changes behavior like MACRO definitions for example INFINITY. gcc on Solaris affect this. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@51553 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-11merge revision(s) 51532: [Backport #11433]nagachika
* array.c (rb_ary_repeated_permutation): fix buffer size, ALLOCV_N already multiplies element size. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@51535 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-10merge revision(s) 50089: [Backport #11342]nagachika
* ext/socket/extconf.rb: Solaris 11 has struct tcp_info.tcpi_ca_state, but it is a dummy. * ext/socket/option.c: Solaris 11 doesn't have u_intN_t. * ext/socket/option.c: Solaris 11 needs inspect_tcpi_msec. * ext/socket/raddrinfo.c: Solaris 11 has AF_PACKET but doesn't have related macros. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@51518 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) 50717: [Backport #11201]nagachika
* lib/mkmf.rb (pkg_config): split --libs if --libs-only-l option is not available. patch in [ruby-core:69428] by Hans Mackowiak. [ruby-core:69421] [Bug #11201] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@51135 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) 50793,51120: [Backport #11162]nagachika
* lib/cmath.rb: [DOC] Add docs [ci skip][Fix GH-909][Bug #11162] Patch provided by @davydovanton git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@51132 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-30merge revision(s) 50860: [Backport #11249]nagachika
* ext/bigdecimal/bigdecimal.gemspec: Fix require paths for released gem. [fix GH-929] Patch by @voxik * ext/io/console/io-console.gemspec: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@51076 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-06-30merge revision(s) 50834: [Backport #11221]nagachika
* ext/zlib/zlib.c: Fix indentation for rdoc. [Bug #11221][ruby-core:69465] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@51075 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-14merge revision(s) 49898: [Backport #10951]nagachika
* vm_insnhelper.c (lep_svar_set): add WBs. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50899 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-06-11merge revision(s) 50685: [Backport #11198]nagachika
* ext/socket/ancdata.c: use RB_GC_GUARD instead of volatile [ruby-core:69419] [Feature #11198] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50838 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 02:27:53 +0000