summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-12-16merge revision(s): 53153 and 23405@ruby_1_9_1ruby_2_0_0usa
* ext/fiddle/handle.c: check tainted string arguments. Patch provided by tenderlove and nobu. * test/fiddle/test_handle.rb (class TestHandle): add test for above. * ext/dl/handle.c (rb_dlhandle_initialize): prohibits DL::dlopen with a tainted name of library. Patch by sheepman <sheepman AT sheepman.sakura.ne.jp>. * ext/dl/handle.c (rb_dlhandle_sym): ditto git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@53161 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-08-18* version.h: forgotten to update.usa
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@51630 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-08-18* 2015-08-18svn
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@51629 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-08-18merge revision(s) 50829: [Backport #11248]usa
* lib/rubygems.rb: bump version to 2.0.14.1. this version fixed CVE-2015-3900. * lib/rubygems/remote_fetcher.rb: ditto. * test/rubygems/test_gem_remote_fetcher.rb: added testcase for CVE-2015-3900 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@51628 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-06-01* lib/resolv.rb (Requester#request): typo, regression introduced atusa
r49422 (patchlevel 618). reported and patched by Stefan Kolb [ruby-core:69429] [Backport #11204] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@50723 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-04-13merge revision(s) 50292: [Backport #9644]usa
* ext/openssl/lib/openssl/ssl.rb: stricter hostname verification following RFC 6125. with the patch provided by Tony Arcieri and Hiroshi Nakamura [ruby-core:61545] [Bug #9644] * test/openssl/test_ssl.rb: add tests for above. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@50294 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-03-24merge revision(s) 49689,49752,49753: [Backport #10953]usa
* common.mk: use ruby organization for rubyspec. * spec/default.mspec: remove specific version number. https://github.com/ruby/rubyspec/commit/7a909e925c1baa9c700bd44af9241aef6e596714 * spec/default.mspec: use default configuration file name. https://github.com/ruby/rubyspec/commit/cc69f337b06362e5607ffa3e3ad40ef7494960cf git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@50069 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-02-25* class.c (clone_method): fixed missing assignment introduced byusa
previous commit. * vm_insnhelper.c (rb_vm_rewrite_cref_stack): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@49745 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-02-25merge revision(s) 49685,49687: [Backport #10885]usa
* vm_insnhelper.c (rb_vm_rewrite_cref_stack): copy nd_refinements of orignal crefs. It fixes segmentation fault when calling refined method in duplicate module. [ruby-dev:48878] [Bug #10885] * vm_core.h, class.c: change accordingly. * test/ruby/test_refinement.rb: add a test for above. of original crefs. It fixes segmentation fault when calling git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@49739 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-02-25merge revision(s) 49222,49480,49493: [Backport #10765] [Backport #1010826]usa
method.h: UNDEFINED_REFINED_METHOD_P * method.h (UNDEFINED_REFINED_METHOD_P): macro to tell if refined original method is defined. * vm_method.c (remove_method): When remove refined method, raise a NameError if the method is not defined in refined class. But if the method is defined in refined class, it should keep refined method and remove original method. Patch by Seiei Higa. [ruby-core:67722] [Bug #10765] * class.c (method_entry_i, class_instance_method_list, rb_obj_singleton_methods): should not include methods of superclasses if recur is false. [ruby-dev:48854] [Bug #10826] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@49738 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-02-25merge revision(s) 49322: [Backport #10753]usa
* vm_method.c (check_definition): Module#public_method_defined?, Module#private_method_defined?, Module#protected_method_defined? should not use refinements. [ruby-core:67656] [Bug #10753] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@49737 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-02-25merge revision(s) 49490,49494: [Backport #10825]usa
* ext/sdbm/_sdbm.c: include ruby/ruby.h for PRIdPTRDIFF when a macro `DEBUG` is defined. based on the patch by Owen Rodley in [ruby-core:67987]. [Bug #10825] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@49736 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-02-25merge revision(s) 49482,49487: [Backport #10821]usa
* lib/mkmf.rb (try_cppflags, try_cflags, try_ldflags): get rid of interference by modifying global variables in have_devel? method. [ruby-core:67962] [Bug #10821] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@49735 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-02-25merge revision(s) 49428: [Backport #10694]usa
* thread.c: Improve documentation for Thread#value [Bug #10694][ruby-core:67324][ci skip] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@49734 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-02-25merge revision(s) 48747: [Backport #10582]usa
* string.c: [DOC] Add missing documentation around String#chomp. Patchby @stderr [ci skip][fix GH-780] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@49733 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-02-21merge revision(s) 48666: [Backport #10873]usa
* lib/uri/generic.rb (URI::Generic.build): use hostname= to detect and wrap IPv6 hosts. Build is accepting URI components and users may not expect that a host component needs to be wrapped with square brackets since it's not providing a URI. Note: initialize with arg_check => true does not wrap IPv6 hosts. by Joe Rafaniello <jrafanie@redhat.com> https://github.com/ruby/ruby/pull/765 fix GH-765 * test/uri/test_generic.rb: Add more tests git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@49669 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-02-18merge revision(s) 49620: [Backport #10857]usa
* 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_0_0@49639 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-02-17merge revision(s) 49525,49575,49579: [Backport #10839]usa
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_0_0@49626 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-02-17merge revision(s) 49463: [Backport #10814]usa
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_0_0@49625 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-02-17merge revision(s) 49543,49557: [Backport #10854]usa
* 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_0_0@49624 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-01-30* numeric.c (coerce_failed): fixed merge miss of r49443.usa
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@49450 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-01-30merge revision(s) 45375,48260,48320,48746: [Backport #10526]usa
* 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_0_0@49448 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-01-30merge revision(s) 48803: [Backport #10568]usa
* pack.c (str_associate, str_associated): keep associated objects in an instance variables, instead of in the internal structure. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@49447 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-01-30merge revision(s) 48854: [Backport #10494]usa
* test/lib/test/unit.rb: Also rescue EINVAL for older Linux that raises it in popen. [Bug #10494] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@49446 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
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