summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-02-19merge revision(s) r49034: [Backport #10662]nagachika
* ext/tk/lib/tkextlib/tcllib/plotchart.rb: fix to invoke correct function of tcllib. Patch by @zalt50 [fix GH-787] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@49651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-02-17merge revision(s) r48563,r46261,r48581: [Backport #10533]nagachika
* lib/net/http.rb: Do not attempt SSL session resumption when the session is expired. [Bug #10533] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@49631 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-02-17merge revision(s) r48417: [Backport #10509]nagachika
* vm_eval.c (rb_yield_splat): add missing GC guard [Bug #10509] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@49630 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-02-17merge revision(s) r49223: [Backport #10732]nagachika
* lib/rdoc/text.rb (expand_tabs): get rid of infinite loop with CR. should check if substitution occurred too. [ruby-dev:48813] [Bug #10732] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@49629 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-02-17merge revision(s) r49620: [Backport #10857]nagachika
* lib/resolv.rb (Resolv::DNS::Resource#==, #hash): elements returned by Kernel#instance_variables are Symbols now. [ruby-core:68128] [Bug #10857] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@49628 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-02-14merge revision(s) r49543,r49557: [Backport #10854]nagachika
* ext/socket/getaddrinfo.c (get_addr): reject too long hostname to get rid of GHOST vulnerability on very old platforms. * ext/socket/raddrinfo.c (make_hostent_internal): ditto, paranoic check for the canonnical name. check for the canonical name. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@49600 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-02-13merge revision(s) r49575,r49579: [Backport #10839]nagachika
test_cipher.rb: show cipher name * test/openssl/test_cipher.rb (test_ciphers): show wrap mode cipher name, which does not end with "wrap". http://rubyci.blob.core.windows.net/fedora21/ruby-trunk/log/20150212T061502Z.fail.html.gz git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@49588 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-02-08merge revision(s) r49525: [Backport #10839]nagachika
test_cipher.rb: OpenSSL 1.0.2 * test/openssl/test_cipher.rb (OpenSSL::TestCipher#test_ciphers): OpenSSL 1.0.2 does not allow wrap mode. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@49548 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-02-02merge revision(s) r48360,r48364: [Backport #10493]nagachika
* ext/etc/etc.c (etc_getlogin): set login name encoding properly. [ruby-core:66163] [Bug #10493] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@49473 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-02-02merge revision(s) r48160: [Backport #10432]nagachika
* proc.c (method_proc): the receiver of binding from method should be same as the receiver of the method. [ruby-core:65917] [Bug #10432] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@49472 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-02-02merge revision(s) r48534: [Backport #10412]nagachika
* lib/resolv.rb: fall back if canonicalization fails. Thanks Vit Ondruch for the patch! [ruby-core:65836] * test/resolv/test_dns.rb: test for patch git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@49471 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-02-02merge revision(s) r48886: [Backport #10210]nagachika
* configure.in (rb_cv_binary_elf): get rid of -e option of cat which is not available on BusyBox, use tr instead. [ruby-core:64824] [Bug #10210] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@49470 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-02-01merge revision(s) r49463: [Backport #10814]nagachika
signal.c: SIGBUS by stack overflow on Funtoo * signal.c (sigbus): seems that Funtoo Linux also delivers SIGBUS at stack overflow. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@49467 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-01-22merge revision(s) r48923: [Backport #10633]nagachika
* ext/openssl/ossl_cipher.c (ossl_cipher_update_long): update huge data gradually not to exceed INT_MAX. workaround of OpenSSL API limitation. [ruby-core:67043] [Bug #10633] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@49383 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-01-21merge revision(s) r48884,r48885: [Backport #10615]nagachika
* signal.c (ruby_signal): since SIGKILL is not supported by MSVCRT, should be treated before calling signal(3). [Bug #10615] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@49370 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-01-21merge revision(s) r48744,r48752: [Backport #10579]nagachika
* eval.c (rb_frame_last_func): return the most recent frame method name. * thread.c (recursive_list_access): use the last method name, instead of the current method name which can be unset in some cases, not to use a symbol by the invalid ID. [ruby-core:66742] [Bug #10579] * thread.c (exec_recursive): use the same last method name as recursive_push in the error message when recursive_pop failed. [ruby-core:66742] [Bug #10579] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@49369 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-01-21merge revision(s) r48484: [Backport #10524]nagachika
* parse.y (symbol_list): fix the node type of literal symbol list with no interpolation. [ruby-core:66343] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@49368 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-01-21merge revision(s) r45375,r48260,r48320,r48746: [Backport #10526]nagachika
* complax.c: [DOC] Document number conversion of `nil` by @skade [fix GH-570] [ci skip] * object.c, rational.c: ditto. * object.c: fix document of Kernel.Stirng by @suzukaze [fix GH-743][ci skip] * object.c (Module#const_defined?): [DOC] Revise the documentation. Patch by Xavier Noria. [Fixes GH-754] https://github.com/ruby/ruby/pull/754 * object.c: [DOC] Revise documentation by Marcus Stollsteimer at [ruby-core:66368]. [Bug #10526] * #inspect: be more specific about generated string, remove obsolete example. * #nil?: use code examples instead of different call-seq's. * #tap: clarify what is yielded. * Integer(): be more specific about to_int and to_i, remove reference to Ruby 1.8. * Array(): fix error. * Class: fix variable name style and indentation in example. * improve consistency, fix typos and formatting. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@49367 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-01-21merge revision(s) r48186: [Backport #10448]nagachika
* load.c (rb_f_load): path name needs to be transcoded to OS path encoding. [ruby-list:49994] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@49366 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-01-20merge revision(s) r44876,r47130,r48988,r48997: [Backport #10640] [Backport ↵nagachika
#10679] configure.in: use C99 * configure.in: ISO9899:1999 is necessary for strtoll() on FreeBSD 10, (and may be possibly other platforms). * configure.in (NET_LUID): include also ifdef.h as a workaround of a bug in mingw-w64 header. [ruby-core:67103] [Bug #10640] * configure.in (NET_LUID): include winsock2.h instead of windows.h. patch by Jon Forums in [ruby-core:67125]. [Bug #10640] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@49356 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-01-07merge revision r48961 partially.nagachika
* tool/config_files.rb: use config.guess in gcc repo. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@49172 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-01-05merge revision(s) r49148: [Backport #9917]nagachika
* test/ruby/test_io.rb: added timeout for AIX environment. [ruby-core:62983][Bug #9917] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@49158 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-01-05* 2015-01-06svn
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@49151 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-01-05* test/ruby/test_string.rb(test_LSHIFT_neary_long_max):nagachika
increase timeout for Arch Linux CI environment. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@49150 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-12-30merge revision(s) r47079: [Backport #9129] [Backport #10531]nagachika
* lib/net/http.rb (Net::HTTP.proxy_uri): use initializer instead of parser to handle IPv6 address. [Bug #9129] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@49076 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-12-30* 2014-12-30svn
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@49075 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-12-30* lib/rubygems/*: upgrade to RubyGems 2.2.3. [Backport #10515]nagachika
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@49074 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-11-27ChangeLog: fix a typo. [ruby-core:66328] [Backport #10521]nagachika
https://github.com/ruby/ruby/pull/760 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@48610 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-11-13merge revision(s) r48402:nagachika
* lib/rexml/document.rb: add REXML::Document#document. reported by Tomas Hoger <[email protected]> and patched by nahi. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@48404 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-11-06merge revision(s) r47860: [Backport #10350]nagachika
* bignum.c (absint_numwords_generic): set an array element after definition of a variable to fix compile error with older version of fcc (Fujitsu C Compiler) 5.6 on Solaris 10 on Sparc. [Bug #10350] [ruby-dev:48608] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@48303 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-11-06merge revision(s) 48288: [Backport #9681]nagachika
* compile.c (compile_data_alloc): add padding when strict alignment is required for memory access. Currently, the padding is enabled only when the CPU is 32-bit SPARC and the compiler is GCC. [Bug #9681] [ruby-core:61715] * compile.c (STRICT_ALIGNMENT): defined if strict alignment is required * compile.c (ALIGNMENT_SIZE, ALIGNMENT_SIZE_MASK, PADDING_SIZE_MAX): new macros for alignemnt word size, bit mask, max size of padding. * compile.c (calc_padding): new function to calculate padding size. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@48302 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-11-04merge revision(s) r48184: [Backport #10272] [Backport #10438]nagachika
* configure.in (__builtin_setjmp): disable with gcc/clang earlier than 4.3 on Mac OS X. [ruby-core:65174] [Bug #10272] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@48274 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-11-04merge revision(s) r46397: [Backport #10434]nagachika
envutil.rb: avoid error on OS X 10.10 * test/ruby/envutil.rb (diagnostic_reports): Mac OS X 10.10 may not create plist file with crash file together. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@48273 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-11-04merge revision(s) r48222: [Backport #10464] [Backport #10465]nagachika
* bignum.c (bary_mul_balance_with_mulfunc): Fix free work area location. [ruby-dev:48723] [Bug #10464] [ruby-core:66044] [Bug #10465] Reported by Kohji Nishihama. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@48272 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-10-28merge revision(s) r48174: [Backport #10438]nagachika
* configure.in: remove apple-gcc4.2 from CC candidates. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@48177 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-10-28* version.h (RUBY_VERSION): bump RUBY_VERSION to 2.1.5.nagachika
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@48176 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 <[email protected]> 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