summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-01-30merge revision(s) 49223: [Backport #10732]usa
* 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_0_0@49445 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-01-30merge revision(s) 41756: [Backport #8115]usa
* lib/mkmf.rb (install_dirs): revert DESTDIR prefix by r39841, since it is fixed by r41648. [ruby-core:55760] [Bug #8115] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@49444 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-01-30merge revision(s) 49224,49225,49234,49235: [Backport #10711]usa
* numeric.c (bit_coerce): use original value for error message [ruby-core:67405] [Bug #10711] * test/ruby/test_numeric.rb (test_coerce): check error message git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@49443 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-01-27* test/ruby/test_refinement.rb: get rid of failures of CI.usa
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@49427 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-01-27Revert r49424. See [Bug #6232]usa
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@49426 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-01-27merge revision(s) 49221: [Backport #10731]usa
* vm_method.c (rb_alias): raise a NameError when creating alias to a refined method if the original method of the refined method is not defined. [ruby-core:67523] [Bug #10731] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@49425 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-01-27merge revision(s) 49244: [Backport #6232]usa
* ext/readline/readline.c (readline_s_refresh_line): initialize before rl_refresh_line(), as some function make the internal state non-clean but rl_refresh_line() does not re-initialize it. [ruby-core:43957] [Bug #6232] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@49424 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-01-27merge revision(s) 49182,49183: [Backport #10706]usa
vm_method.c: fix change refined new method visibility * vm_method.c (rb_export_method): bail out if the original method is undefined when the method is refined. [ruby-core:67387] [Bug #10706] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@49423 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-01-27merge revision(s) 49175: [Backport #10712]usa
* lib/resolv.rb: consider ENETUNREACH as ResolvTimeout [ruby-core:67411] [Bug #10712] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@49422 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-01-22merge revision(s) 49202: [Backport #10668]usa
* ext/zlib/zlib.c: fix document of method signatures. [Bug #10668][ruby-core:67186][ci skip] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@49382 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-01-22merge revision(s) 49148: [Backport #9917]usa
* 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_0_0@49381 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-01-22merge revision(s) 49104,49105: [Backport #10692]usa
* test/net/http/test_http.rb (_test_send_request__HEAD): Added failing test for send_request with HEAD method. * lib/net/http.rb (Net::HTTP#send_request): there is no response body with HEAD request. Patch by @rodrigosaito [fix GH-520] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@49378 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-01-14merge revision(s) 49034: [Backport #10662]usa
* 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_0_0@49253 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-01-14merge revision(s) 49071-49073,49078: [Backport #10550]usa
* lib/resolv.rb (Resolv::DNS::Name#==): DNS is case-insensitive, so the comparison should be case-insensitive as well. [ruby-core:66498] [Bug #10550] * lib/resolv.rb (Resolv::DNS::Name): names with different dots should be different. * lib/resolv.rb (Resolv::DNS::Name#==): Compare an array of Label:Str objects. Label#Str#== is case-insensitive. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@49252 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-01-14merge revision(s) 48948: [Backport #10591]usa
* lib/net/http/response.rb (Net::HTTPResponse): require one or more spaces [Bug #10591]. by leriksen <leif.eriksen.au@gmail.com> https://github.com/ruby/ruby/pull/782 fix GH-782 NOTE: graph.facebook.com returns without SP Reason-Phrase. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@49250 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-01-14merge revision(s) 48923: [Backport #10633]usa
* 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_0_0@49249 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-01-14merge revision(s) 48886: [Backport #10210]usa
* 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_0_0@49248 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-01-14merge revision(s) 48884,48885: [Backport #10615]usa
* signal.c (ruby_signal): since SIGKILL is not supported by MSVCRT, should be treated before calling signal(2). [Bug #10615] should be treated before calling signal(3). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@49247 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-01-14merge revision(s) 48744,48752: [Backport #10579]usa
* 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_0_0@49246 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-01-14merge revision(s) 48534: [Backport #10412]usa
* 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_0_0@49245 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-11-28merge revision(s) 48563: [Backport #10533]usa
* 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_0_0@48636 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-11-28merge revision(s) 48484: [Backport #10524]usa
* 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_0_0@48635 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-11-28merge revision(s) 48360,48364: [Backport #10493]usa
* 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_0_0@48634 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-11-28merge revision(s) 48160: [Backport #10432]usa
* 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_0_0@48633 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-11-28merge revision(s) 47079: [Backport #10530]usa
* 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_0_0@48632 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-11-28merge revision(s) 42709: [Backport #10529]usa
* io.c (copy_stream_body): should write in binary mode. based on a patch by godfat (Lin Jen-Shin) at [ruby-core:56556]. [ruby-core:56518] [Bug #8767] * io.c (copy_stream_body): move common open flags. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@48631 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-11-28* lib/rubygems/ssl_certs/AddTrustExternalCARoot{-2048,}.pem: add newerusa
root CA for rubygems.org. a part of r48389 of trunk. see also https://github.com/rubygems/rubygems/commit/98f5f44c7141881c756003e4256b1a96b200b98e . [Backport #10516] [ruby-core:66303] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@48630 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-11-19merge revision(s) 48417: [Backport #10509]usa
* 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_0_0@48491 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-11-13merge revision(s) 48402:usa
* lib/rexml/document.rb: add REXML::Document#document. reported by Tomas Hoger <thoger@redhat.com> and patched by nahi. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@48403 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-11-06* compile.c (compile_data_alloc): add padding when strict alignmentusa
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_0_0@48296 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-11-05merge revision(s) 48102: [Backport #10413]usa
* 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_0_0@48284 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-10-28* version.h: forgotten to bump patchlevel.usa
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@48173 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-10-28* 2014-10-28svn
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@48172 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-10-28* test/rexml/test_document.rb: fix typo (patch mistake).usa
reported and patched by Jeremy Evans at [Bug #10439] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@48171 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-10-27merge revision(s) 48161:usa
* 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_0_0@48162 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-10-27merge revision(s) 48111,48118,48120: [Backport #10421]usa
* 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_0_0@48149 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-10-23merge revision(s) 45274,45278,45280,48097: [Backport #9424]usa
* 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_0_0@48110 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-10-20merge revision(s) 48000: [Backport #10368]usa
* 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_0_0@48048 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-10-17merge revision(s) 47973: [Backport #10392]usa
* 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_0_0@47989 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-10-17merge revision(s) 47716: [Backport #10285]usa
* 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_0_0@47988 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-10-17merge revision(s) 47645: [Backport #10263]usa
* 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_0_0@47987 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-10-16* regcomp.c, regexec.c: Optimization should be disabled not only forusa
/(?<=x).*/ but also for /(?!x).*/. (merge r47598 partially. [Bug #9728]) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@47976 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-10-16merge revision(s) 46783: [Backport #6716]usa
* 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_0_0@47974 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-10-15merge revision(s) 47111,47212,47451,47452,47680: [Backport #10245]usa
* 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_0_0@47937 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-10-15merge revision(s) 47896: [Backport #10369]usa
* 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_0_0@47936 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-10-15merge revision(s) 47891: [Backport #10373]usa
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_0_0@47935 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-10-15merge revision(s) 47850: [Backport #10294]usa
* 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_0_0@47934 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-10-15merge revision(s) 47819: [Backport #9914]usa
* configure.in: Fix typo. [Bug #9914] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@47933 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-10-15merge revision(s) 47820: [Backport #10330]usa
* error.c: update exception tree. [DOC] reported by @hemge via twitter. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@47932 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-10-15merge revision(s) 47641,47642,47644: [Backport #10262]usa
* 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_0_0@47931 b2dd03c8-39d4-4d8f-98ff-823fe69b080e