Commit Graph
5907 Commits
Author SHA1 Message Date
usa 073cc5e815 merge revision(s): 53153 and 23405@ruby_1_9_1
* 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-12-16 12:30:28 +00:00
usa ec54e6433f merge revision(s) 50829: [Backport #11248]
* 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-08-18 13:01:02 +00:00
usa 329ab042ee merge revision(s) 50292: [Backport #9644]
* 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-04-13 13:16:27 +00:00
usa 94ec0a6419 merge revision(s) 49222,49480,49493: [Backport #10765] [Backport #1010826]
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-25 06:01:25 +00:00
usa 24bb5756b1 merge revision(s) 49322: [Backport #10753]
* 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-25 05:42:47 +00:00
usa 5b37cb25ec merge revision(s) 49482,49487: [Backport #10821]
* 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-25 05:26:38 +00:00
usa 4e1bea5f5a merge revision(s) 48666: [Backport #10873]
* 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-21 00:49:36 +00:00
usa 4388d98671 merge revision(s) 49620: [Backport #10857]
* 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-18 07:03:16 +00:00
usa 61bb4b389e merge revision(s) 49525,49575,49579: [Backport #10839]
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-17 08:59:14 +00:00
usa 842fd42e42 merge revision(s) 48803: [Backport #10568]
* 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-30 07:42:52 +00:00
usa d650009151 merge revision(s) 49223: [Backport #10732]
* 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-30 07:13:13 +00:00
usa 6b7e6324b4 merge revision(s) 49224,49225,49234,49235: [Backport #10711]
* 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-30 06:54:29 +00:00
usa 2666cbc045 * test/ruby/test_refinement.rb: get rid of failures of CI.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@49427 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-01-27 15:30:40 +00:00
usa 56c49c9780 Revert r49424. See [Bug #6232]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@49426 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-01-27 10:17:48 +00:00
usa d604893f20 merge revision(s) 49221: [Backport #10731]
* 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-27 08:06:50 +00:00
usa 169ec127e0 merge revision(s) 49244: [Backport #6232]
* 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-27 08:01:44 +00:00
usa d7e152bf06 merge revision(s) 49182,49183: [Backport #10706]
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-27 07:43:57 +00:00
usa 8c519e28b9 merge revision(s) 49148: [Backport #9917]
* 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-22 09:10:55 +00:00
usa acdab5fd56 merge revision(s) 49104,49105: [Backport #10692]
* 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-22 08:31:38 +00:00
usa 568a5d520b merge revision(s) 49071-49073,49078: [Backport #10550]
* 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-14 07:49:35 +00:00
usa f9d88c6059 merge revision(s) 48948: [Backport #10591]
* 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-14 07:32:00 +00:00
usa 9120d051e1 merge revision(s) 48744,48752: [Backport #10579]
* 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-14 07:04:09 +00:00
usa e6a5f817d6 merge revision(s) 48534: [Backport #10412]
* 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
2015-01-14 06:55:00 +00:00
usa 3f23ee7015 merge revision(s) 48484: [Backport #10524]
* 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-28 07:37:22 +00:00
usa bcafeef2e7 merge revision(s) 48360,48364: [Backport #10493]
* 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-28 07:30:21 +00:00
usa 7149859bc3 merge revision(s) 48160: [Backport #10432]
* 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-28 07:20:40 +00:00
usa 32ecaac7b1 merge revision(s) 42709: [Backport #10529]
* 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 07:11:26 +00:00
usa d6ea8d18f9 merge revision(s) 48402:
* 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-13 13:35:51 +00:00
usa fb9df41221 merge revision(s) 48102: [Backport #10413]
* 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-11-05 09:28:08 +00:00
usa cc9b047c90 * test/rexml/test_document.rb: fix typo (patch mistake).
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-28 04:38:20 +00:00
usa 61ff012d26 merge revision(s) 48161:
* 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-27 11:22:04 +00:00
usa 2c31816f1a merge revision(s) 48111,48118,48120: [Backport #10421]
* 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-27 04:28:03 +00:00
usa 4a5d839ceb merge revision(s) 45274,45278,45280,48097: [Backport #9424]
* 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-23 09:59:40 +00:00
usa 28f249a75b merge revision(s) 48000: [Backport #10368]
* 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-20 05:45:53 +00:00
usa 13d3a28049 merge revision(s) 47973: [Backport #10392]
* 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-17 04:23:06 +00:00
usa 897b2177c1 merge revision(s) 47716: [Backport #10285]
* 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-17 04:20:40 +00:00
usa 6d886eb255 merge revision(s) 47645: [Backport #10263]
* 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-17 04:13:38 +00:00
usa 4110e5fa62 merge revision(s) 46783: [Backport #6716]
* 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-16 07:23:46 +00:00
usa 9c1588a86d merge revision(s) 47111,47212,47451,47452,47680: [Backport #10245]
* 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-15 07:24:53 +00:00
usa 95285e3457 merge revision(s) 47591: [Backport #10242]
* 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_0_0@47611 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-09-17 06:09:51 +00:00
usa 8676e7a9bc merge revision(s) 47590: [Backport #10241]
* 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_0_0@47610 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-09-17 06:08:22 +00:00
usa 58ff66b18b merge revision(s) 46391,46395: [Backport #9766]
* 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_0_0@47608 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-09-17 05:56:35 +00:00
usa 9f67424dc9 merge revision(s) 46501,47372,47460: [Backport #10191]
* 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_0_0@47548 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-09-12 02:36:28 +00:00
usa 23abce4bff * test/ruby/envutil.rb: remove duplicated method. this problem was introduced
at r47479.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@47504 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-09-10 04:38:43 +00:00
usa 9d742d7365 merge revision(s) 47288: [Backport #10153]
* 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_0_0@47503 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-09-10 03:36:25 +00:00
usa 07b140ecb1 merge revision(s) 47221: [Backport #10149]
* 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_0_0@47502 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-09-10 03:32:54 +00:00
usa 33e54f3400 merge revision(s) 47327: [Backport #10101]
* 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_0_0@47500 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-09-10 03:24:33 +00:00
usa 1b7b47010a merge revision(s) 44916: [Backport #10043]
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_0_0@47499 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-09-10 03:20:47 +00:00
usa ae6d24859a merge revision(s) 46569: [Backport #9982]
* 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_0_0@47497 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-09-10 03:05:22 +00:00
usa 1872f299e2 merge revision(s) 47362: [Backport #9984]
* test/openssl/test_pkey_rsa.rb (OpenSSL#test_sign_verify_memory_leak):
	  added timeout into testcase for low performance environment.
	  [Bug #9984][ruby-core:63367]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@47494 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-09-10 02:49:27 +00:00