summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-10-27add tag v2_1_4v2_1_4nagachika
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/tags/v2_1_4@48166 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-10-27merge revision(s) r48161:nagachika
* lib/rexml/entity.rb: keep the entity size within the limitation. reported by Willis Vandevanter <will@silentrobots.com> and patched by nahi. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@48163 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-10-25merge revision(s) r48111,r48118,r48120: [Backport #10421]nagachika
* vm_method.c (rb_method_entry_make): warn redefinition only for already defined methods, but not for undefined methods. [ruby-dev:48691] [Bug #10421] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@48138 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-10-25merge revision(s) r48102: [Backport #10413]nagachika
* class.c (unknown_keyword_error): delete expected keywords directly from raw table, so that the given block is not called. [ruby-core:65837] [Bug #10413] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@48137 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-10-22merge revision(s) r45274,r45278,r45280,r48097: [Backport #9424] [Backport #9640]nagachika
* lib/openssl/ssl.rb: Explicitly whitelist the default SSL/TLS ciphers. Forbid SSLv2 and SSLv3, disable compression by default. Reported by Jeff Hodges. [ruby-core:59829] [Bug #9424] * test/openssl/test_ssl.rb: Reuse TLS default options from OpenSSL::SSL::SSLContext::DEFAULT_PARAMS. * ext/openssl/lib/openssl/ssl.rb (DEFAULT_PARAMS): override options even if OpenSSL::SSL::OP_NO_SSLv3 is not defined. this is pointed out by Stephen Touset. [ruby-core:65711] [Bug #9424] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@48098 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-10-18merge revision(s) r48000: [Backport #10368]nagachika
* vm_core.h, vm.c, proc.c: fix GC mark miss on bindings. [ruby-dev:48616] [Bug #10368] * test/ruby/test_eval.rb: add a test code. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@48004 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-10-18merge revision(s) r47973: [Backport #10392]nagachika
* parse.y (parser_here_document): do not append already appended and disposed code fragment. [ruby-dev:48647] [Bug #10392] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@48003 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-10-16merge revision(s) r47716: [Backport #10285]nagachika
* ext/stringio/stringio.c (strio_write): ASCII-8BIT StringIO should be writable any encoding strings, without conversion. [ruby-core:65240] [Bug #10285] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47982 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-10-16merge revision(s) r47645: [Backport #10263]nagachika
* vm_eval.c (eval_string_with_cref): fix super from eval with scope. set klass in the current control frame to the class of the receiver in the context to be evaluated, this class/module must match the actual receiver to call super. [ruby-core:65122] [Bug #10263] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47980 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-10-15merge revision(s) r47900: [Backport #10035]nagachika
* lib/find.rb (Find.find): Call to_path for arguments to obtain strings. [ruby-core:63713] [Bug #10035] Reported by Herwin. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47958 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-10-15merge revision(s) r47715: [Backport #10282]nagachika
* object.c (rb_class_real): do not dereference 0 VALUE * test/ruby/test_module.rb (test_inspect_segfault): Test case and bug report by Thomas Stratmann. [ruby-core:65214] [Bug #10282] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47957 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-10-15merge revision(s) r47818,r47832: [Backport #9820]nagachika
* signal.c (rb_f_kill): should not ignore signal unless the default handler is registered. [ruby-dev:48592] [Bug #9820] * signal.c (rb_f_kill): get rid of deadlock as unhandled and discarded signals do not make interrupt_cond signaled. based on the patch by Kazuki Tsujimoto at [ruby-dev:48606]. [Bug #9820] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47956 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-10-15* 2014-10-16svn
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47955 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-10-15merge r47598 partially. extracted commits are as follows. [Bug #9728]nagachika
https://github.com/k-takata/Onigmo/commit/15ddec6d18e27fdc1988236764e766fd5892ecf5 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47954 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-10-15merge revision(s) r46783: [Backport #6716]nagachika
* lib/fileutils.rb: handle ENOENT error with symlink targeted to non-exists file. [ruby-dev:45933] [Bug #6716] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47953 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-10-15merge revision(s) r45715: [Backport #10265]nagachika
* configure.in: NetBSD's ksh, used by configure, needs escapes. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47952 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-10-15merge revision(s) r47896: [Backport #10369]nagachika
* array.c (ary_recycle_hash): add RB_GC_GUARD (rb_ary_diff): remove volatile [Bug #10369] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47949 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-10-15merge revision(s) r47891: [Backport #10373]nagachika
proc.c: method body GC guard * proc.c (rb_mod_define_method): guard method body to prevent its method entry from GC. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47947 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-10-15merge revision(s) r47850: [Backport #10294]nagachika
* dir.c (dir_s_aref): fix rdoc. `Dir.glob` allows an array but `Dir[]` not. the former accepts an optional parameter `flags`, while the latter accepts arbitrary number of arguments but no `flags`. [ruby-core:65265] [Bug #10294] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47946 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-10-15merge revision(s) r47819: [Backport #9914]nagachika
* configure.in: Fix typo. [Bug #9914] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47945 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-10-15merge revision(s) r47820: [Backport #10330]nagachika
* error.c: update exception tree. [DOC] reported by @hemge via twitter. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47944 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-09-23merge revision(s) r47696,r47697: [Backport #10279]nagachika
* parse.y (parse_ident): just after a label, new expression should start, cannot be a modifier. [ruby-core:65211] [Bug #10279] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47703 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-09-23merge revision(s) r47641,r47642,r47644: [Backport #10262]nagachika
* win32/win32.c (VCSUP): nothing to do if this worktree is not under any VCS (it means that the worktree may be from the release package). * win32/Makefile.sub (VCSUP): nothing to do if this worktree is not under any VCS (it means that the worktree may be from the release package). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47702 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-09-23merge revision(s) r47683: [Backport #10281]nagachika
array.c: GC guard * array.c (rb_ary_splice): prevent replacing array from GC. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47701 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-09-23merge revision(s) r47111,r47212,r47451,r47452,r47680: [Backport #10245]nagachika
* test/minitest/test_minitest_unit.rb: removed obsoleted condition for Ruby 1.8. * test/ruby/test_time_tz.rb: ditto. * test/ruby/test_time_tz.rb: Fix test error with tzdata-2014g. [ruby-core:65058] [Bug #10245] Reported by Vit Ondruch. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47700 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-09-23* version.h (RUBY_VERSION): bump RUBY_VERSION to 2.1.4.nagachika
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47699 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-09-18* version.h (RUBY_VERSION): bump RUBY_VERSION to 2.1.3.nagachika
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47629 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-09-15merge revision(s) r46495,r46499: [Backport #9971]nagachika
signal.c: no cfunc frame at stack overflow * signal.c (check_stack_overflow): avoid pushing a cfunc frame, trying to fix stack overflow deadlock. * signal.c (check_stack_overflow): drop the last tag too close to the fault page, to get rid of stack overflow deadlock. [Bug #9971] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47597 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-09-15merge revision(s) r47591: [Backport #10242]nagachika
* ext/pathname/lib/pathname.rb (SAME_PATHS): Pathname#relative_path_from uses String#casecmp to compare strings on case-insensitive filesystem platforms (e.g., Windows). This can return nil for strings with different encodings, and the code previously assumed that it always returned a Fixnum. [Fix GH-713] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47596 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-09-15merge revision(s) r47590: [Backport #10241]nagachika
* ext/fiddle/lib/fiddle/import.rb (Fiddle::Importer#sizeof): fix typo, SIZEOF_LONG_LON. [Fix GH-714] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47595 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-09-15merge revision(s) r44459,r44470: [Backport #8315]nagachika
* lib/mkmf.rb (configuration): Make CXXFLAGS customizable. Patch by Kohei Suzuki (eagletmt). [Fixes GH-492] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47592 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-09-14merge revision(s) r47457: [Backport #8315]nagachika
* lib/mkmf.rb (MakeMakefile#pkg_config): append --cflags to also $CXXFLAGS, as they are often used by C++ compiler. [ruby-core:54532] [Bug #8315] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47587 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-09-14merge revision(s) r46391,r46395: [Backport #9766]nagachika
* lib/csv.rb (CSV#<<): honor explicity given encoding. based on the patch by DAISUKE TANIWAKI <daisuketaniwaki AT gmail.com> at [ruby-core:62113]. [Bug #9766] * lib/csv.rb (CSV#<<): honor explicitly given encoding. based on git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47586 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-09-10merge revision(s) r46501,r47372,r47460: [Backport #10191]nagachika
* object.c (rb_obj_copy_ivar): extract function to copy instance variables only for T_OBJECT from init_copy. * object.c (rb_obj_copy_ivar): allocate no memory for empty instance variables. [ruby-core:64700] [Bug #10191] * test/ruby/test_object.rb: extend timeout. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47520 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-09-10merge r46831 partially. extracted commits are as follows. [Bug #9344]nagachika
https://github.com/k-takata/Onigmo/commit/bdfc1997aa15b6baddaf9a482c6610b32504bd86 * regcomp.c: Merge Onigmo 5.14.1 25a8a69fc05ae3b56a09. this includes Support for Unicode 7.0 [Bug #9092]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47519 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-09-10merge revision(s) r47248: [Backport #10161]nagachika
* common.mk (Doxyfile): revert r43888, not to require preinstalled ruby. [ruby-core:64488] [Bug #10161] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47518 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-09-09merge revision(s) r47288: [Backport #10153]nagachika
* io.c (io_close): ignore only "closed stream" IOError and NoMethodError, do not swallow other exceptions at the end of block. [ruby-core:64463] [Bug #10153] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47486 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-09-09merge revision(s) r47221: [Backport #10149]nagachika
* enc/trans/euckr-tbl.rb (EUCKR_TO_UCS_TBL): add missing euro and registered signs. [ruby-core:64452] [Bug #10149] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47485 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-09-09merge revision(s) r47196: [Backport #10144]nagachika
* time.c (time_timespec): fix tv_nsec overflow [Bug #10144] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47482 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-09-09merge revision(s) r47191: [Backport #10140]nagachika
* iseq.c (rb_iseq_clone): Should not insert write barrier from non-RVALUE data (to non-RVALUE data, of course). Ruby 2.1 also has a same problem. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47481 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-09-09merge revision(s) r47190: [Backport #10139]nagachika
* string.c (setup_fake_str): fake strings should not set class by RBASIC_SET_CLASS() because it insert write barriers to fake (non-RVALUE) structure. It can cause unexpected behaviour. Ruby 2.1 also have a same problem (setup_fake_str() in parse.y). * symbol.c (setup_fake_str): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47480 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-09-06Bump patch level from r47426zzak
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47427 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-09-06Backport r47425zzak
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47426 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-09-05merge revision(s) r47327: [Backport #10008]nagachika
* ext/zlib/zlib.c (gzfile_reset): preserve ZSTREAM_FLAG_GZFILE [Bug #10101] * test/zlib/test_zlib.rb (test_rewind): test each_byte git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47419 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-09-05merge revision(s) r46796: [Backport #10008]nagachika
* configure.in (rb_cv_broken_backtrace): exit with failure normally, no needs to abort. [ruby-core:63678] [Bug #10008] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47418 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-09-05merge revision(s) r44916: [Backport #10043]nagachika
error.c: Crash Report log * error.c (REPORTBUG_MSG): mention about Crash Report log file on MacOS X. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47416 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-09-05merge revision(s) r45046,r45047,r45063,r45087,r45146,r45150,r45151,r45152: ↵nagachika
[Backport #9525] * ext/socket: Wrap struct addrinfo by struct rb_addrinfo. * ext/socket: Bypass getaddrinfo() if node and serv are numeric. Reporeted by Naotoshi Seo. [ruby-core:60801] [Bug #9525] * ext/socket/extconf.rb: Detect struct sockaddr_in6.sin6_len. * ext/socket/sockport.h (SET_SIN6_LEN): New macro. (INIT_SOCKADDR_IN6): Ditto. * ext/socket/rubysocket.h (struct rb_addrinfo): Add allocated_by_malloc field. * ext/socket/raddrinfo.c (numeric_getaddrinfo): New function. (rb_getaddrinfo): Call numeric_getaddrinfo at first. (rb_freeaddrinfo): Free struct addrinfo properly when it is allocated by numeric_getaddrinfo. * ext/socket/raddrinfo.c (numeric_getaddrinfo): Use xcalloc. Suggested by Eric Wong. https://bugs.ruby-lang.org/issues/9525#note-14 * ext/socket/raddrinfo.c (rb_getaddrinfo): second argument of MEMZERO is type. Coverity Scan found this bug. * include/ruby/win32.h, win32/win32.c (rb_w32_inet_pton): add a wrapper function for inet_pton minimum supported client is Vista, as well as inet_ntop. * ext/socket/option.c (inet_pton): use rb_w32_inet_pton, instead of inet_ntop directly, which is unavailable on older version Windows. * ext/socket/raddrinfo.c (inet_pton): use rb_w32_inet_pton, instead of inet_pton directly, which is unavailable on older version Windows. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47415 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-09-03merge revision(s) r47217: [Backport #10062]nagachika
* ext/thread/thread.c (get_array): check instance variables are initialized properly. [ruby-core:63826][Bug #10062] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47378 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-09-03merge revision(s) r46876: [Backport #10039]nagachika
* io.c (rb_io_initialize): [DOC] fix rdoc of append mode. it does not move the pointer at open. [ruby-core:63747] [Bug #10039] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47377 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-09-03merge revision(s) r46569: [Backport #9982]nagachika
* sprintf.c (GETASTER): should not use the numbered argument to be formatted, raise ArgumentError instead. [ruby-dev:48330] [Bug #9982] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47376 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
generated by cgit v1.2.3 (git 2.25.1) at 2026-06-01 22:08:53 +0000