summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-01-12merge revision(s) 44260: [Backport #9168] nagachika
patch inspired from r44260 on trunk. [ruby-core:58652] [Bug #9168] * gc.c (run_finalizer): clear th->errinfo before invoke finalizer and restore afterward. * test/ruby/test_gc.rb (test_exception_in_finalizer): add test for above. * vm_trace.c (rb_threadptr_exec_event_hooks_orig): clear th->errinfo before invoke hook. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44576 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-01-12merge revision(s) 44570:nagachika
tcltklib.c: create_ip_exc format argument * ext/tk/tcltklib.c (create_ip_exc): format argument must not be a dynamic string, not to contain unescaped %. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44575 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-01-12merge revision(s) 43587: [Backport #8623]nagachika
* tool/rbinstall.rb (Gem::Specification#collect): make stable Gem::Specification.files in default .gemspecs the different order of "files" in .gemspec files makes them different therefore possibly conflicting in multilib scenario. patch by vo.x (Vit Ondruch) at [ruby-core:57544] [Bug #8623]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44567 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-01-12merge revision(s) 43676: [Backport #8439]nagachika
* test/openssl/test_cipher.rb (test_aes_gcm_wrong_tag): Don't use String#succ because it can make modified (wrong) auth_tag longer than 16 bytes. The longer auth_tag makes that EVP_CIPHER_CTX_ctrl (and internally aes_gcm_ctrl) fail. [ruby-core:55143] [Bug #8439] reported by Vit Ondruch. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44566 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-01-12merge revision(s) 44195: [Backport #7772]nagachika
* util.c (ruby_qsort): fix potential stack overflow on a large machine. based on the patch by Conrad Irwin <conrad.irwin AT gmail.com> at [ruby-core:51816]. [Bug #7772] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44565 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-01-12merge revision(s) 41351: [Backport #9199]nagachika
* ext/tk/tkutil/tkutil.c: use rb_sprintf(), rb_id2str(), and rb_intern_str() instead of rb_intern() and RSTRING_PTR() with RB_GC_GUARD(), to prevent temporary objects from GC. [ruby-core:39000] [Bug #5199] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44564 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-01-06merge revision(s) 44455,44458,44510: [Backport #9315]nagachika
* vm_insnhelper.c (vm_search_super_method): direct superclass of a module is found when super called in a Method object generated a method defined in a module, call method_missing in that case. [ruby-core:59358] [Bug #9315] * proc.c (mnew_from_me): keep iclass as-is, to make inheritance chain consistent. [ruby-core:59358] [Bug #9315] * proc.c (method_owner): return the original defined_class from prepended iclass, instead. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44511 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-01-03merge revision(s) 44488,44489: [Backport #9341]nagachika
* test/net/imap/cacert.pem: generate new CA cert, since the last one expired. [Bug #9341] [ruby-core:59459] * test/net/imap/server.crt: new server cert signed with updated CA. * test/net/imap/Makefile: add `make regen_certs` to automate this process. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44491 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-24merge revision(s) 43954: [Backport #9125]nagachika
* lib/net/smtp.rb (Net::SMTP#critical): Always return a Net::SMTP::Response. Patch by Pawel Veselov. [ruby-trunk - Bug #9125] * test/net/smtp/test_smtp.rb: Test for the above. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44393 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-24merge revision(s) 40829:nagachika
fix typos inspired by r40825 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44391 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-24merge revision(s) 44184: [Backport #9247]nagachika
* ext/socket/lib/socket.rb: Don't test $! in "ensure" clause because it may be set before the body. Reported by ko1 and mrkn. [ruby-core:59088] [Bug #9247] * lib/cgi/core.rb: Ditto. * lib/drb/ssl.rb: Ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44390 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-23merge revision(s) 44019: [Backport #9213]nagachika
* lib/mkmf.rb (configuration): strip destdir part from prefix to get rid of duplication. a patch by arton at [ruby-core:58859]. [ruby-core:58856] [Bug #9213] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44367 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-23merge revision(s) 44198: [Backport #9236]nagachika
* proc.c (mnew_from_me): method by respond_to_missing? should be owned by the original class. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44366 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-22merge revision(s) 44175,44179: [Backport #9236]nagachika
* proc.c (method_owner): return the class where alias is defined, not the class original method is defined. * vm_method.c (rb_method_entry_make, rb_alias): store the originally defined class in me. [Bug #7993] [Bug #7842] [Bug #9236] * vm_method.c (rb_method_entry_get_without_cache): cache included module but not iclass. * proc.c (mnew_from_me): achieve the original defined_class from prepended iclass, to fix inherited owner. * proc.c (method_owner): return the defined class, but not the class which the method object is created from. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44345 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-21merge revision(s) 44127: [Backport #9238]nagachika
* insns.def: Fix optimization bug of Float#/ [Bug #9238] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44326 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-21merge revision(s) 43685,43690,43705: [Backport #9110]nagachika
* eval_jump.c (rb_exec_end_proc): fix double free or corruption error when reentering by callcc. [ruby-core:58329] [Bug #9110] * test/ruby/test_beginendblock.rb: test for above. * eval_jump.c (rb_exec_end_proc): unlink and free procs data before calling for each procs. [Bug #9110] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44325 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-21merge revision(s) 44312,44318,44321: [Backport #9273]nagachika
* lib/resolv.rb (Resolv::Hosts#lazy_initialize): should not consider encodings in hosts file. [ruby-core:59239] [Bug #9273] * lib/resolv.rb (Resolv::Config.parse_resolv_conf): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44324 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-21merge revision(s) 44307: [Backport #9199] [Backport #9272]nagachika
* win32/Makefile.sub (fake.rb): fixed wrong RUBY_PLATFORM, to correctly install win32.h. [ruby-core:58801][Bug #9199] reported by arton. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44323 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-21merge revision(s) 44000: [Backport #9205]nagachika
test_gc.rb: shorten * test/ruby/test_gc.rb (test_sweep_in_finalizer): omit iteration number to 2. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44322 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-21merge revision(s) 43994: [Backport #9205]nagachika
* gc.c (finalize_deferred): flush all deferred finalizers while other finalizers can get ready to run newly by lazy sweep. [ruby-core:58833] [Bug #9205] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44319 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-21merge revision(s) 43996:nagachika
* ruby_atomic.h (ATOMIC_PTR_EXCHANGE): atomic exchange function for a generic pointer. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44317 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-21merge revision(s) 43851,43882,43883,43995:nagachika
* ruby_atomic.h: use __atomic builtin functions supported by GCC. __sync family are legacy functions now and it is recommended that new code use the __atomic functions. http://gcc.gnu.org/onlinedocs/gcc/_005f_005fatomic-Builtins.html * configure.in: check existence of __atomic functions. * ruby_atomic.h: define ATOMIC_SIZE_CAS() with __atomic_compare_exchange_n() and refactoring. * ruby_atomic.h: remove duplicate definisions between ATOMIC_XXX and ATOMIC_SIZE_XXX. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44316 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-21merge revision(s) 41759,41760,43356,43460,43677:nagachika
* ruby_atomic.h (ATOMIC_CAS): suppress C4022 and C4047 warnings in VC6. only InterlockedCompareExchange is declared using PVOID. * ruby_atomic.h (rb_w32_atomic_cas): call InterlockedCompareExchange directly. * ruby_atomic.h (ATOMIC_CAS): fix missing function call. * ruby_atomic.h (ATOMIC_SIZE_CAS): new macro, compare and swap size_t. * ruby_atomic.h (ATOMIC_SIZE_CAS): fix compile error on Solaris since r43460. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44315 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-21merge revision(s) 43669,43672,43678: [Backport #8958]nagachika
* ext/bigdecimal/lib/bigdecimal/util.rb: [DOC] Document the required +precision+ argument for Rational#to_d [Bug #8958] * ext/bigdecimal/lib/bigdecimal/util.rb: [DOC] +precision+ is required * ext/bigdecimal/lib/bigdecimal/util.rb: [DOC] remove example of Rational#to_d without argument. [Bug #8958] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44314 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-20merge revision(s) 44086,44126: [Backport #9221]nagachika
* ext/date/date_parse.c (parse_time): unset case-insensitive flag for [:alpha:], which already implies both cases, to get rid of backtrack explosion. [ruby-core:58876] [Bug #9221] * ext/date/date_strptime.c (date__strptime_internal): unset case-insensitive flag for [:alpha:], which already implies both cases, to get rid of backtrack explosion. [ruby-core:58984] [Bug #9221] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44306 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-13merge revision(s) 41427:nagachika
test_pty.rb: reap zombie * test/test_pty.rb (test_cloexec): reap zombie than leaving to detaching thread. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44182 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-12merge revision(s) 39722: [Backport #9178]nagachika
* enumerator.c (enumerator_with_index): try to convert given offset to integer. fix bug introduced in r39594. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44150 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-02merge revision(s) 43929: [Backport #9178]nagachika
* enumerator.c (enumerator_with_index): should not store local variable address to memoise the arguments. it is invalidated after the return. [ruby-core:58692] [Bug #9178] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@43961 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-02merge revision(s) 39594,39596: [Backport #8010]nagachika
* enumerator.c (enumerator_with_index_i): allow Bignum as offset, to get rid of conversion exception and integer overflow. [ruby-dev:47131] [Bug #8010] * enumerator.c (enumerator_with_index): Restore handling of a nil memo from r39594. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@43960 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-02merge revision(s) 43853: [Backport #9157]nagachika
* file.c (rb_readlink): fix buffer overflow on a long symlink. since rb_str_modify_expand() expands from its length but not its capacity, need to set the length properly for each expansion. [ruby-core:58592] [Bug #9157] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@43959 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-28merge revision(s) 43888: [Backport #9169]nagachika
* common.mk (Doxyfile): tool/file2lastrev.rb needs running with BASERUBY since r43617. [ruby-dev:47823] [Bug #9169] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@43904 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-22merge revision(s) 43780:nagachika
util.c: more precision * util.c (ruby_strtod): BigMath requires more precision. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@43783 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-22merge revision(s) 43775:nagachika
* util.c (ruby_strtod): ignore too long fraction part, which does not affect the result. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@43778 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-21* version.h (RUBY_PATCHLEVEL): update patchlevel to 351.nagachika
fix commit miss of r43732. [ruby-core:58444] [Backport #9131] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@43741 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-20* 2013-11-20svn
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@43733 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-20* test/ruby/test_thread.rb (test_mutex_unlock_on_trap): extend waitingnagachika
time to invocation of signal handler from 0.01 sec to 0.2 sec. RubyCI report error on mswin. reported by @unak git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@43732 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-13* lib/rubygems: Update to RubyGems 2.0.14. [ruby-core:58300]nagachika
[Backport #9104] the patch is provided by drbrain (Eric Hodel). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@43661 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-12merge revision(s) 43449,43514,43525: [Backport #8879] [Backport #8883]nagachika
* load.c (ruby_init_ext): share feature names between frame name and provided features. * load.c (rb_feature_p): deal with default loadable suffixes. * load.c (load_lock): initialize statically linked extensions. * load.c (search_required, rb_require_safe): deal with statically linked extensions. * load.c (ruby_init_ext): defer initalization of statically linked extensions until required actually. [Bug #8883] * load.c (ruby_init_ext): defer initialization of statically linked git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@43656 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-12merge revision(s) 43609,43617: [Backport #8878] [Backport #9085]nagachika
vcs.rb: split * tool/vcs.rb: split from file2lastrev.rb. * tool/rbinstall.rb (Gem::Specification.load): obtain spec date from VCS for the case using git, RUBY_RELEASE_DATE is the last resort. probably fixes [Bug #9085]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@43655 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-12merge revision(s) 42862(partially),42910,43093: [Backport #8878] [Backport ↵nagachika
#9085] * common.mk: use RUNRUBY instead of MINIRUBY because MINIRUBY can't require extension libraries. The patch is from nobu (Nobuyoshi Nakada). * configure.in (RUNRUBY): append -- only after runruby.rb, not cross-compiling baseruby, so that $(RUN_OPT) can be command line options. [ruby-dev:47703] [Bug #8893] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@43654 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-11merge revision(s) 42902:nagachika
vm_method.c: constify * vm_method.c (rb_resolve_refined_method): constify. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@43650 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-11merge revision(s) 40136: [Backport #9084]nagachika
* ext/socket/init.c (cloexec_accept): Fix a compile error on Debian GNU/kFreeBSD. Consider HAVE_ACCEPT4 is defined but SOCK_CLOEXEC is not defined. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@43649 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-11merge revision(s) 43398,43407,43408,43417: [Backport #9044]nagachika
* win32/Makefile.sub (config.h): VC 2013 supports C99 mathematics functions. [ruby-core:57981] [Bug #9044] * include/ruby/win32.h (rb_infinity_float): suppress overflow in constant arithmetic warnings. [ruby-core:57981] [Bug #9044] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@43648 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-10-31merge revision(s) 41808,41829: [Backport #8384] [Backport #9065]nagachika
* ext/openssl/ossl_pkey_ec.c: Ensure compatibility to builds of OpenSSL with OPENSSL_NO_EC2M defined, but OPENSSL_NO_EC not defined. * test/openssl/test_pkey_ec.rb: Iterate over built-in curves (and assert their non-emptiness!) instead of hard-coding them, as this may cause problems with respect to the different availability of individual curves in individual OpenSSL builds. [ruby-core:54881] [Bug #8384] Thanks to Vit Ondruch for providing the patch! * test/openssl/test_pkey_ec.rb: Skip tests for "Oakley" curves as they are not suitable for ECDSA. [ruby-core:54881] [Bug #8384] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@43481 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-10-26* lib/rubygems: Update to RubyGems 2.0.13. [ruby-core:58031]nagachika
[Backport #9052] the patch is provided by drbrain (Eric Hodel). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@43435 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-10-26* gc.c (gc_prof_set_heap_info): fix compile error whennagachika
GC_PROFILE_MORE_DETAIL != 0. the patch is provided by ko1 (Koichi Sasada). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@43429 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-10-24* lib/rubygems: Update to RubyGems 2.0.12. [ruby-core:57818]nagachika
[Backport #9014] the patch is provided by drbrain (Eric Hodel). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@43416 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-10-24merge revision(s) 43413: [Backport #9048]nagachika
* parse.y: Remove +(binary) and -(binary) special cases [Feature #9048] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@43415 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-10-24merge revision(s) 43376: [Backport #9038]nagachika
* encoding.c (load_encoding): should preserve outer errinfo, so that expected exception may not be lost. [ruby-core:57949] [Bug #9038] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@43414 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-10-17merge revision(s) 43334: [Backport #9030]nagachika
* vm_insnhelper.c (vm_call_method): set ci->me to 0 when the original method of a refined method is undef to avoid SEGV. * vm_method.c (rb_method_entry_without_refinements): return 0 when the original method of a refined method is undef to avoid SEGV. * test/ruby/test_refinement.rb: related test. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@43345 b2dd03c8-39d4-4d8f-98ff-823fe69b080e