summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-07-13merge revision(s) 41851:nagachika
* lib/fileutils.rb (FileUtils#chown, FileUtils#chown_R): If user and group are both nil, print ":". git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41945 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-07-13merge revision(s) 41839,41841:nagachika
* bignum.c (biglsh_bang): Fix bignum digits under-run. * bignum.c (bigrsh_bang): Fix bignum digits overrun. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41944 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-07-13merge revision(s) 41815,41816: [Backport #8606]nagachika
* configure.in (RUBY_DTRACE_POSTPROCESS): dtrace version SUN D 1.11 introduces a check in the dtrace compiler to ensure that probes actually exist. If there are no probes, then the -G step will fail. As this test is only being used to determine whether -G is necessary (for instance, on OSX it is not), adding a real probe to the conftest allows it to succeed on newer versions of dtrace. Patch by Eric Saxby <sax AT livinginthepast.org> at [ruby-core:55826]. [Fix GH-351], [Bug #8606]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41943 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-07-13merge revision(s) 41807:nagachika
* test/openssl/test_x509crl.rb: Remove unused variable. [ruby-core:53501] [Bug #8114] Thanks, Vipul Amler, for pointing this out! git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41941 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-07-06merge revision(s) 41805: [Backport #8575] [Backport #8582]nagachika
* lib/openssl/ssl.rb: Fix SSL client connection crash for SAN marked critical. The patch for CVE-2013-4073 caused SSL crash when a SSL server returns the certificate that has critical SAN value. X509 extension could include 2 or 3 elements in it: [id, criticality, octet_string] if critical, [id, octet_string] if not. Making sure to pick the last element of X509 extension and use it as SAN value. [ruby-core:55685] [Bug #8575] Thank you @nahi for providing the patch! git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41812 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-07-06merge revision(s) 41781: [Backport #8604]nagachika
* lib/fileutils.rb (FileUtils#symbolic_modes_to_i): Fix the wrong character class [+-=], which happened to match all desired characters but also match undesired characters. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41811 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-07-06merge revision(s) 41796:nagachika
* lib/fileutils.rb (FileUtils#chown, FileUtils#chown_R): Fix the wrong output message when user is nil, which should be "chown :group file" instead of "chown group file". git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41810 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-07-06merge revision(s) 41785:nagachika
Fix comment typo by @parroty [fix GH-350] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41809 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-07-04merge revision(s) 41764,41765,41767: [Backport #8583]nagachika
* regcomp.c (): Merge Onigmo 5.13.5 23b523076d6f1161. https://bugs.ruby-lang.org/issues/8583 * [bug] (thanks Akinori MUSHA and Ippei Obayashi) Fix a renumbering bug in condition regexp with a named capture. [Bug #8583] * [spec] (thanks Akinori MUSHA) Allow ENCLOSE_OPTION in look-behind. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41780 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-07-03merge revision(s) 41734,41737: [Backport #8596]nagachika
* lib/mkmf.rb (try_config): Fix to not replace $LDFLAGS with $libs (1.9.3 behavior) [ruby-core:55752] [Bug #8595] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41758 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-07-01merge revision(s) 41623,41723: [Backport #6862] [Backport #8587]nagachika
* ext/bigdecimal/bigdecimal.c (BigMath_s_exp): Fix for the cases when the argument x is not a BigDecimal. This change is based on the patch made by Garth Snyder. [Fix GH-332] https://github.com/ruby/ruby/pull/332 This change is based on the patch made by Heesob Park and Garth Snyder. [Bug #6862] [ruby-core:47145] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41733 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-06-27merge revision(s) 40336: [Backport #8142]nagachika
* compile.c (iseq_add_mark_object): Use new rb_iseq_add_mark_object(). * insns.def (setinlinecache): Ditto. * iseq.c (rb_iseq_add_mark_object): New function to allocate iseq->mark_ary on demand. [Bug #8142] * iseq.h (rb_iseq_add_mark_object): Ditto. * iseq.c (prepare_iseq_build): Avoid allocating mark_ary until needed. * iseq.c (rb_iseq_build_for_ruby2cext): Ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41682 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-06-27merge revision(s) 41671:nagachika
* ext/openssl/lib/openssl/ssl.rb (verify_certificate_identity): fix hostname verification. Patched by nahi. * test/openssl/test_ssl.rb (test_verify_certificate_identity): test for above. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41672 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-06-27merge revision(s) 41600: [Backport #8058]nagachika
* test/rubygems/test_gem_installer.rb (test_install_extension_flat): use ruby in build directory in case ruby is not installed. [ruby-core:53265] [Bug #8058] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41668 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-06-26revert r41577 because it causes memory error on mswin CI.nagachika
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41666 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-06-26merge revision(s) 41254,41655: [Backport #8519]nagachika
test_io.rb: fix test error * test/ruby/test_io.rb (TestIO#test_write_32bit_boundary): retry to remove the temporary file while EACCES occurs because of syncing in the system probably. rescue ENOSPC from IO#tell. [ruby-core:55457] [Bug #8519] * test/ruby/test_io.rb (TestIO#test_write_32bit_boundary): skip if writing a file is slow. [ruby-core:55541] [Bug #8519] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41659 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-06-26merge revision(s) 41648: [Backport #8115]nagachika
* lib/mkmf.rb: should use expanded values for header directories unless extmk. patch by vo.x (Vit Ondruch) at [ruby-core:55653] [Bug #8115], rhbz#921650. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41658 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-06-25merge revision(s) 41629: [Backport #8533]nagachika
* lib/rubygems/ext/builder.rb (Gem::Ext::Builder.make): Pass DESTDIR via command line to override what's in MAKEFLAGS. This fixes an installation problem under a package building environment where DESTDIR is specified in the (parent) command line. [Fixes GH-327] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41635 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-06-24merge revision(s) 41593:nagachika
* array.c: Return value in Array overview example found by @PragTob [Fix GH-336] https://github.com/ruby/ruby/pull/336 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41606 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-06-24merge revision(s) 41592:nagachika
* array.c (rb_ary_zip): typo by @PragTob [Fix GH-337] https://github.com/ruby/ruby/pull/337 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41605 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-06-24merge revision(s) 41590,41591:nagachika
* win32/README.win32: grammar typo by @blankenshipz [Fix GH-334] https://github.com/ruby/ruby/pull/334 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41604 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-06-22merge revision(s) 41325: [Backport #8554]nagachika
* gc.c: Fixup around GC by MALLOC. Add allocate size to malloc_increase before GC for updating limit in after_gc_sweep. Reset malloc_increase into garbage_collect() for preventing GC again soon. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41577 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-06-22merge revision(s) 41558: [Backport #8561]nagachika
* ext/etc/etc.c (etc_getpwnam): use PRIsVALUE in format string instead of %s and RSTRING_PTR * ext/etc/etc.c (etc_getgrnam): ditto git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41575 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-06-21merge revision(s) 41076: [Backport #8558]nagachika
* lib/rubygems: Update to RubyGems 2.0.3 * test/rubygems: Tests for the above. * NEWS: Added RubyGems 2.0.3 note. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41543 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-06-20merge revision(s) 41468:nagachika
test_fiber.rb: longer timeout * test/ruby/test_fiber.rb (test_many_fibers): make timeout longer. 10sec is not sufficient. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41499 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-06-19merge revision(s) 41411:nagachika
test_signal.rb: extra quotes * test/ruby/test_signal.rb (TestSignal#test_signal_process_group): remove extra quotes. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41434 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-06-18merge revision(s) 41389: [Backport #8540]nagachika
* vm_insnhelper.c (vm_call_method): ensure methods of type VM_METHOD_TYPE_ATTR_SET are called with 1 argument * test/ruby/test_module.rb (class TestModule): add test [ruby-core:55543] [Bug #8540] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41395 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-06-18merge revision(s) 40525,40526,40528,40530: [Backport #8345]nagachika
proc.c: remove unnecessary static function * proc.c (proc_lambda): remove and use rb_block_lambda directly instead. * include/ruby/intern.h (rb_block_lambda): add declaration instead of deprecated rb_f_lambda. * proc.c (mproc, mlambda): use frozen core methods instead of plain global methods, so that methods cannot be overridden. [ruby-core:54687] [Bug #8345] * vm.c (Init_VM): define proc and lambda on the frozen core object. * defs/id.def (predefined): add "idProc". * proc.c (mnew, mproc, mlambda): use predefined IDs. * vm.c (Init_VM): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41394 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-06-18merge revision(s) 41343,41360,41386: [Backport #8531]nagachika
test/ruby/test_symbol.rb: tests for [Bug #8531] * include/ruby/ruby.h, vm_eval.c (rb_funcall_with_block): new function to invoke a method with a block passed as an argument. * string.c (sym_call): use the above function to avoid a block sharing. [ruby-dev:47438] [Bug #8531] * vm_insnhelper.c (vm_yield_with_cfunc): don't set block in the frame. * test/ruby/test_symbol.rb (TestSymbol#test_block_given_to_proc): run related tests. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41393 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-06-18merge revision(s) 41342,41359,41361: [Backport #8341]nagachika
test/ruby/test_proc.rb: tests for [Bug #8341] * include/ruby/intern.h, proc.c (rb_method_call_with_block): new function to invoke a Method object with a block passed as an argument. * proc.c (bmcall): use the above function to avoid a block sharing. [ruby-core:54626] [Bug #8341] * test/ruby/test_proc.rb (TestProc#test_block_persist_between_calls): run related tests. * test/ruby/test_proc.rb (TestProc#test_block_given_method_to_proc): run test for r41359. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41392 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-06-18merge revision(s) 41370:nagachika
Message is 3rd argument, not 2nd git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41391 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-06-18merge revision(s) 40057:nagachika
use long_ary to suppress warning git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41369 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-06-17merge revision(s) 40849:nagachika
test_objectspace.rb: run test_each_object separately * test/ruby/test_objectspace.rb (TestObjectSpace#test_each_object): run separately. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41366 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-06-17merge revision(s) 40059,40061:nagachika
* test/ruby/envutil.rb (assert_separately): stop_auto_run of Test::Unit::Runner to prevent auto runner use ARGV. * test/ruby/envutil.rb (assert_separately): add $: to separate process. * test/ruby/envutil.rb (assert_separately): fail if stderr is not empty and ignore_stderr is false. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41365 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-06-17merge revision(s) 39721:nagachika
* test/ruby/envutil.rb (EnvUtil.with_default_external): add for changing Encoding.default_external without warnings. * test/ruby/envutil.rb (EnvUtil.with_default_internal): ditto. * test/ruby/test_io_m17n.rb: use above with_default_external. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41364 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-06-17merge revision(s) 41348:nagachika
* vm_backtrace.c: Update rdoc for Backtrace#label with @_ko1 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41363 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-06-17merge revision(s) 41347: [Backport #5048] [Backport #5465] [Backport #8319]nagachika
* ext/tk/extconf.rb: support s390x (Thanks to bkabrda) [ruby-trunk - Bug #5465] * ext/tk/extconf.rb: apply [Backport87 - Backport #5048] * ext/tk/lib/tk/canvas.rb, ext/tk/sample/demos-{en,jp}/{tree.rb,widget}: fix bug (Thanks to zzak) [ruby-trunk - Bug #8319] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41362 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-06-15merge revision(s) 41245: [Backport #8513]nagachika
* array.c (FL_SET_EMBED): shared object is frozen even when get unshared. * array.c (rb_ary_modify): ARY_SET_CAPA needs unshared array. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41323 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-06-15merge revision(s) 39733: [Backport #8527]nagachika
* insns.def: fix condition. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41321 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-06-15merge revision(s) 41266: [Backport #8517]nagachika
* ext/socket/extconf.rb: Enable RFC 3542 IPV6 socket options for OS X 10.7+. [ruby-trunk - Bug #8517] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41320 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-06-15merge revision(s) 41300: [Backport #8489]nagachika
* compile.c (rb_iseq_compile_node): fix location of a `trace' instruction (b_return event). [ruby-core:55305] [ruby-trunk - Bug #8489] (need a backport to 2.0.0?) * test/ruby/test_settracefunc.rb: add a test. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41319 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-06-15merge revision(s) 41315: [Backport #8436]nagachika
vm_eval.c: suppress warning * vm_eval.c (eval_string_with_cref): move absolute_path inside non-exception block, since it is used only there. [Bug #8436] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41318 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-06-15merge revision(s) 40759,40966,41305,41306: [Backport #8436]nagachika
vm_eval.c: suppress warning * vm_eval.c (eval_string_with_cref): narrow a variable scope into the EXEC_TAG block to suppress -Wclobberd warning. * vm_eval.c (eval_string_with_cref): propagate absolute path from the binding if it is given explicitly. patch by Gat (Dawid Janczak) at [ruby-core:55123]. [Bug #8436] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41317 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-06-12* 2013-06-13svn
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41263 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-06-12merge revision(s) 41019,41020,41021,41041,41045,41057: [Backport #8463]nagachika
vm_insnhelper.c: add comments * vm_insnhelper.c (vm_yield_setup_block_args): break a long line and add comments. remove useless code. * vm_insnhelper.c (vm_yield_setup_block_args): split single parameter if any keyword arguments exist, and then extract keyword arguments. [ruby-core:55203] [Bug #8463] * compile.c (iseq_set_arguments): not a simple single argument if any keyword arguments exist. [ruby-core:55203] [Bug #8463] * vm_insnhelper.c (vm_yield_setup_block_args): partially revert r41019. The code is not useless. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41262 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-06-12merge revision(s) 41250: [Backport #8516]nagachika
* io.c (io_getc): fix 7bit coderange condition, check if ascii read data instead of read length. [ruby-core:55444] [Bug #8516] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41260 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-06-08merge revision(s) 39841: [Backport #8115]nagachika
* lib/mkmf.rb (install_dirs, with_destdir): prefix with DESTDIR directories to install only unless bundled extension libraries. [ruby-core:53502] [Bug #8115] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41193 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-06-08merge revision(s) 41175: [Backport #8502]nagachika
* class.c (include_modules_at): invalidate method cache if included module contains constants * test/ruby/test_module.rb: add test git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41192 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-06-08merge revision(s) 40783 (partially): [Backport #8413]nagachika
* win32/Makefile.sub (config.status): fix typo. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41191 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-06-08merge revision(s) 40913: [Backport #8434]nagachika
* intern.h: remove dangling rb_class_init_copy declaration [ruby-core:55120] [Bug #8434] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41190 b2dd03c8-39d4-4d8f-98ff-823fe69b080e