Commit graph

6735 commits

Author SHA1 Message Date
nagachika
86f8f5d94e merge revision(s) r45758,r45759: [Backport #9759]
* vm.c (invoke_block_from_c): add VM_FRAME_FLAG_BMETHOD to record
	  it is bmethod frame.

	* vm.c (vm_exec): invoke RUBY_EVENT_RETURN event if rollbacked frame
	  is VM_FRAME_FLAG_BMETHOD.
	  [Bug #9759]

	* test/ruby/test_settracefunc.rb: add a test for TracePoint/set_trace_func.

	* vm_core.h: rename rb_thread_t::passed_me to
	  rb_thread_t::passed_bmethod_me to clarify the usage.

	* vm_insnhelper.c (vm_call_bmethod_body): use renamed member.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45928 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-05-12 13:49:33 +00:00
nagachika
3cbfd63479 merge revision(s) r45360,r45361: [Backport #9651]
* vm_eval.c (eval_string_with_cref): Use file path even if scope is
	  given. Related to [ruby-core:56099] [Bug #8662] and r42103.

	* vm_eval.c (eval_string_with_cref): Unify to use NIL_P.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45927 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-05-12 13:18:13 +00:00
nagachika
78358a72be merge revision(s) r45901:
envutil.rb: successfully terminated process

	* test/ruby/envutil.rb (FailDesc): allow successfully terminated
  process without a signal.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45908 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-05-10 15:01:24 +00:00
nagachika
4b1eca7ea0 merge revision(s) r45891,r45893,r45895:
test_beginendblock.rb, test_signal.rb: run with default handler

	* test/ruby/test_beginendblock.rb (test_propagate_signaled): run
  with default handler.

	* test/ruby/test_signal.rb (test_hup_me): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45905 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-05-10 14:25:23 +00:00
nagachika
b494603551 merge revision(s) r44619:
test_gc.rb: relax assertion

	* test/ruby/test_gc.rb (test_profiler_total_time): GC time may be
  shorter than the timer resolution.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45866 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-05-07 15:49:11 +00:00
nagachika
01cf2127bd merge revision(s) r45595: [Backport #9743] [Backport #9745]
* ext/openssl/ossl_pkey.c (ossl_pkey_verify): as EVP_VerifyFinal()
	  finalizes only a copy of the digest context, the context must be
	  cleaned up after initialization by EVP_MD_CTX_cleanup() or a
	  memory leak will occur.  [ruby-core:62038] [Bug #9743]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45821 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-05-04 17:44:00 +00:00
nagachika
acd893d175 merge revision(s) r45291,r45299,r45314,r45325: [Backport #9518]
* ext/dl/cptr.c (dlptr_free), ext/dl/handle.c (dlhandle_free),
	  ext/fiddle/handle.c (fiddle_handle_free),
	  ext/fiddle/pointer.c (fiddle_ptr_free): fix memory leak.
	  based on the patch Heesob Park at [ruby-dev:48021] [Bug #9599].


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45820 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-05-04 17:32:44 +00:00
nagachika
647b55f64a merge revision(s) r45298,r45311: [Backport #9518]
test/ruby/envutil.rb: compare RSS to check memory leak

	* test/ruby/envutil.rb (Test::Test#assert_no_memory_leak): compare
  also RSS if available.

	* test/ruby/memory_status.rb (Memory::Status.parse): read string
  form of an instance.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45819 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-05-04 17:19:20 +00:00
nagachika
7c89c50847 merge revision(s) r45221: [Backport #9798]
* ext/psych/lib/psych/visitors/yaml_tree.rb: support dumping Encoding
	  objects.

	* ext/psych/lib/psych/visitors/to_ruby.rb: support loading Encoding
	  objects.

	* test/psych/test_encoding.rb: add test

	* ext/psych/lib/psych.rb: add version


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45811 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-05-04 15:40:57 +00:00
naruse
b8b43fbdbe merge revision(s) 44432: [Backport #9299]
* proc.c: Having optional keyword arguments makes maximum arity +1,
	  not unlimited [#8072]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45231 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-03-01 12:01:29 +00:00
naruse
7a620ac530 merge revision(s) 44433: [Backport #9299]
* proc.c: Having any mandatory keyword argument increases min arity
	  [#9299]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45226 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-03-01 08:25:29 +00:00
naruse
be2101a641 merge revision(s) 44412,44413,44414,44420,44421: [Backport #9298]
test_method.rb, test_proc.rb: suppress warnings

	* test/ruby/test_method.rb: suppress warnings in verbose mode.

	* test/ruby/test_proc.rb: ditto.
	* proc.c (rb_iseq_min_max_arity): maximum argument is unlimited if
	  having rest keywords argument.  [ruby-core:53298] [Bug #8072]

	* iseq.c (rb_iseq_parameters): push argument type symbol only for
	  unnamed rest keywords argument.

	* compile.c (iseq_set_arguments): set arg_keyword_check from
	  nd_cflag, which is set by parser.  internal ID is used for
	  unnamed keyword rest argument, which should be separated from no
	  keyword check.

	* iseq.c (rb_iseq_parameters): if no keyword check, keyword rest is
	  present.

	* parse.y (new_args_tail_gen): set keywords check to nd_cflag, which
	  equals to that keyword rest is not present.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45138 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-22 13:13:24 +00:00
naruse
776b8b1fd1 merge revision(s) 45076: [Backport #9535]
* class.c (rb_mod_init_copy): do nothing if copying self.
	  [ruby-dev:47989] [Bug #9535]

	* hash.c (rb_hash_initialize_copy): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45128 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-22 09:53:35 +00:00
naruse
d2164fc5f2 merge revision(s) 45057,45059: [Backport #9533]
* hash.c (rb_hash_flatten): fix behavior of flatten(-1).
	  [ruby-dev:47988] [Bug #9533]

	* test/ruby/test_array.rb: test for above.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-22 09:24:49 +00:00
naruse
330dccb9b4 merge revision(s) 44628: [Backport #9413]
* eval.c (rb_mod_s_constants): return its own constants for other
	  than Module itself.  [ruby-core:59763] [Bug #9413]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45124 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-22 08:38:43 +00:00
naruse
d439b3b1d9 merge revision(s) 45066: [Backport #9545] [Backport #9550]
* ext/socket/ancdata.c (bsock_sendmsg_internal): only retry on error
	  (bsock_recvmsg_internal): ditto

	* test/socket/test_unix.rb: test above for infinite loop


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45120 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-22 07:19:41 +00:00
naruse
669e9ac5ff merge revision(s) 44931: [Backport #9452]
* vm_insnhelper.c (vm_call_method): should check ci->me->flag of
	  a refining method in case the method is private.
	  [ruby-core:60111] [Bug #9452]

	* vm_method.c (make_method_entry_refined): set me->flag of a refined
	  method entry to NOEX_PUBLIC in case the original method is private
	  and it is refined as a public method.  The original flag is stored
	  in me->def->body.orig_me, so it's OK to make a refined method
	  entry public.  [ruby-core:60111] [Bug #9452]

	* test/ruby/test_refinement.rb: related tests.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45107 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-22 05:05:22 +00:00
naruse
a98f024d5c merge revision(s) 44595: [Backport #9342]
* ext/thread/thread.c (rb_szqueue_clear): notify SZQUEUE_WAITERS
	  on SizedQueue#clear. [ruby-core:59462] [Bug #9342]

	* test/thread/test_queue.rb: add test. the patch is from
	  Justin Collins.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45104 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-22 04:21:39 +00:00
naruse
02cc3d942a merge revision(s) 44449: [Backport #9416]
* parse.y (local_push_gen, local_pop_gen): save cmdarg_stack to
	  isolate command argument state from outer scope.
	  [ruby-core:59342] [Bug #9308]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45086 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-21 15:42:08 +00:00
naruse
adfa331bbc merge revision(s) 44616,44622,44623,44626,44632,44636:
add timeout to test_do_reply

	20140115T073301Z.log.html.gz

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45085 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-21 15:12:52 +00:00
naruse
b376132317 merge revision(s) 44462,44477: [Backport #9314]
* encoding.c (must_encindex, rb_enc_from_index, rb_obj_encoding): mask
	  encoding index and ignore dummy flags.  [ruby-core:59354] [Bug #9314]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45083 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-21 14:53:48 +00:00
naruse
1d5d057531 merge revision(s) 44531: [Backport #9300]
* ext/psych/lib/psych/visitors/yaml_tree.rb: dumping strings with
	  quotes should not have changed.  [ruby-core:59316] [Bug #9300]

	* ext/psych/lib/psych.rb: fixed missing require.

	* test/psych/test_string.rb: test


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45079 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-21 14:06:17 +00:00
naruse
14a3402357 merge revision(s) 44312,44318: [Backport #9273]
* lib/resolv.rb (Resolv::Hosts#lazy_initialize): should not
	  consider encodings in hosts file.  [ruby-core:59239] [Bug #9273]

	* lib/resolv.rb (Resolv::Config.parse_resolv_conf): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45075 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-21 09:08:45 +00:00
naruse
862b86f2e4 merge revision(s) 44604,44605,44606: [Backport #9415]
test_m17n.rb: split tests for inspect

	* test/ruby/test_m17n.rb (test_utf_16_32_inspect): split tests for
  each encodings.
	* string.c (get_actual_encoding): get actual encoding according to
	  the BOM if exists.

	* string.c (rb_str_inspect): use according encoding, instead of
	  pseudo encodings, UTF-{16,32}.  [ruby-core:59757] [Bug #8940]

	* string.c (get_encoding): respect BOM on pseudo encodings.
	  [ruby-dev:47895] [Bug #9415]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45074 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-21 08:34:35 +00:00
naruse
56b6eed323 merge revision(s) 45021,45022,45028: [Backport #9524]
* gc.c: introduce new environment variable
	  "RUBY_GC_HEAP_OLDOBJECT_LIMIT_FACTOR" to control major/minor GC
	  frequency.
	  Do full GC when the number of old objects is more than R * N
	  where R is this factor and

	* test/ruby/test_gc.rb: add a test.

	* gc.c (get_envparam_double): fix a warning message.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45044 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-19 06:00:46 +00:00
naruse
3c00535d1a Add missing file of r44858
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44866 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-06 18:11:13 +00:00
naruse
0de6eef3d2 merge revision(s) 44852: [Backport #9343]
* ext/thread/thread.c (rb_szqueue_max_set): use correct queue and
	  limit wakeups.  [Bug #9343][ruby-core:60517]

	* test/thread/test_queue.rb (test_sized_queue_assign_max):
	  test for bug


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44863 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-06 07:24:46 +00:00
naruse
9b9d3bac4d * lib/rubygems: RubyGems 2.2.2 which contains the following bug fixes:
http://rubygems.rubyforge.org/rubygems-update/History_txt.html#label-2.2.2+%2F+2014-02-05
  https://bugs.ruby-lang.org/issues/9489


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44858 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-06 02:59:36 +00:00
naruse
1f478676c4 merge revision(s) 44555:
test_weakref.rb: find collected weakref

	* test/test_weakref.rb (test_recycled): retry and find a WeakRef
  whose the target is collected, to fix circumstance dependent.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44850 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-05 15:47:37 +00:00
naruse
eef4a3cd72 merge revision(s) 44583: [Backport #9302]
* ext/thread/thread.c (rb_szqueue_push): check GET_SZQUEUE_WAITERS
	  instead of GET_QUEUE_WAITERS to prevent deadlock. Patch by Eric Wong.
	  [Bug #9302] [ruby-core:59324]

	* test/thread/test_queue.rb: add test


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44847 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-05 14:57:11 +00:00
naruse
72d18038d9 merge revision(s) 44525,44534,44537: [Backport #9381]
* hash.c (rb_objid_hash): return hash value from object ID with a
	  salt, extract from rb_any_hash().

	* object.c (rb_obj_hash): return same value as rb_any_hash().
	  fix r44125.  [ruby-core:59638] [Bug #9381]

	* hash.c (rb_any_hash): should treat the return value of rb_objid_hash()
	  as `long', because ruby assumes the object id of an object is `long'.
	  this fixes test failures on mswin64 introduced at r44525.

	* hash.c (rb_objid_hash): should return `long'.  brushup r44534.

	* object.c (rb_obj_hash): follow above change.
	  as `long', because ruby assumes the hash value of the object id of
	  an object is `long'.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44846 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-05 14:53:48 +00:00
naruse
e7a2c4251e merge revision(s) 44527,44552,44553:
* vm_insnhelper.c (vm_search_super_method): when super called in a
	  bound UnboundMethod generated from a module, no superclass is
	  found since the current defined class is the module, then call
	  method_missing in that case.  [ruby-core:59619] [Bug #9377]

	* vm_insnhelper.c (vm_search_super_method): allow bound method from a
	  module, yet another method transplanting.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44843 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-05 13:41:03 +00:00
naruse
c00e288936 merge revision(s) 44517,44518,44519,44523: [Backport #9354]
* lib/timeout.rb (Timeout#timeout): when a custom exception is given,
	  no instance is needed to be caught, so defer creating new instance
	  until it is raised.  [ruby-core:59511] [Bug #9354]

	* lib/timeout.rb (Timeout#timeout): should not rescue ordinarily
	  raised ExitException, which should not be thrown.

	* lib/timeout.rb (Timeout::ExitException.catch): set @thread only if
	  it ought to be caught.

	* lib/timeout.rb (Timeout::ExitException.catch): pass arguments
	  for new instance.

	* lib/timeout.rb (Timeout::ExitException#exception): fallback to
	  Timeout::Error if couldn't throw.  [ruby-dev:47872] [Bug #9380]

	* lib/timeout.rb (Timeout#timeout): initialize ExitException with
	  message for the fallback case.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44841 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-05 12:43:19 +00:00
naruse
c0bdb2511d merge revision(s) 44512: [Backport #9340]
* array.c (ary_add_hash): Fix consistency issue between Array#uniq and
	  Array#uniq! [Bug #9340] [ruby-core:59457]

	* test/ruby/test_array.rb (class TestArray): regression test for above.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44839 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-05 11:29:40 +00:00
naruse
bda2300c4d merge revision(s) 44501: [Backport #9353]
* struct.c (rb_struct_set): return assigned value from setter method
	  rather than struct object. [Bug #9353] [ruby-core:59509]

	* test/ruby/test_struct.rb (test_setter_method_returns_value): add test


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44826 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-05 04:05:53 +00:00
naruse
673745f799 merge revision(s) 44803: [Backport #9478]
* string.c (rb_str_modify_expand): enable capacity and disable
	  assocation with packed objects when setting capa, so that
	  pack("p") string fails to unpack properly after modified.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44819 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-05 02:35:13 +00:00
naruse
3da0a0cead merge revision(s) 44630,44631: [Backport #9403]
* lib/delegate.rb (Delegator): keep source information methods
	  which start and end with '__'.  [ruby-core:58572] [Bug #9155]
	  which start and end with '__'.  [ruby-core:59718] [Bug #9403]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44794 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-02 13:46:46 +00:00
naruse
484a6ffb78 merge revision(s) 44373: [Backport #9417]
test_alias.rb: rename duplicate name

	* test/ruby/test_alias.rb (test_alias_wb_miss): rename duplicate
  name to get rid of redefinition.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44788 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-01 08:35:30 +00:00
naruse
8f87be4e22 Revert r44778 #9375
It breaks test-all if all tests are in a single process


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44786 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-01 08:19:06 +00:00
naruse
3efb494a21 merge revision(s) 44515: [Backport #9375]
* lib/rubygems:  Update to RubyGems master 21e409d / RubyGems 2.2.1.
	  See http://rubygems.rubyforge.org/rubygems-update/History_txt.html
	  for a list of bug fixes.

	* test/rubygems:  ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44778 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-01-31 09:17:42 +00:00
naruse
32e4d034ca merge revision(s) 44455,44458,44510: [Backport #9349]
* vm_insnhelper.c (vm_search_super_method): direct superclass of a
	  module is found when super called in a Method object generated a
	  method defined in a module, call method_missing in that case.
	  [ruby-core:59358] [Bug #9315]

	* proc.c (mnew_from_me): keep iclass as-is, to make inheritance
	  chain consistent.  [ruby-core:59358] [Bug #9315]

	* proc.c (method_owner): return the original defined_class from
	  prepended iclass, instead.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44777 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-01-31 08:58:59 +00:00
naruse
16c8a6d4b4 merge revision(s) 44588: [Backport #9316]
* ext/bigdecimal/bigdecimal.c (BigDecimal_divide): Add an additional
	  digit for the quotient to be compatible with bigdecimal 1.2.1 and
	  the former.  [ruby-core:59365] [#9316] [#9305]

	* test/bigdecimal/test_bigdecimal.rb: tests for the above change.

	* ext/bigdecimal/bigdecimal.gemspec: bigdecimal version 1.2.4.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44711 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-01-27 07:56:58 +00:00
naruse
ba97a56685 merge revision(s) 44358,44359,44360,44363: [Backport #9275]
hash.c: reword

        * hash.c (HAS_EXTRA_STATES, rb_hash_reject): use words "extra states".
        * hash.c (HAS_EXTRA_STATES): warn extra states only when something
          differ.  [ruby-core:59254] [Bug #9275]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44683 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-01-23 02:17:40 +00:00
naruse
b0d69f3c18 merge revision(s) 44598,44599,44600:
/usr/lib/libc.so is not symlink on FreeBSD 10

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44602 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-01-15 02:29:58 +00:00
naruse
a1d56b18d5 merge revision(s) 44488: [Backport #9341]
* test/net/imap/cacert.pem: generate new CA cert, since the last one
	  expired. [Bug #9341] [ruby-core:59459]

	* test/net/imap/server.crt: new server cert signed with updated CA.

	* test/net/imap/Makefile: add `make regen_certs` to automate this
	  process.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44528 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-01-08 23:21:11 +00:00
naruse
41deb12e9d fix previous commit
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44467 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-30 21:16:30 +00:00
naruse
e1536a7424 fix ruby/test_hash.rb [ruby-core:59154] [Bug #9223]
the behavior is under 2.2.0


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44466 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-30 21:11:18 +00:00
naruse
ca050a8d57 merge revision(s) 44411: [Backport #9295]
* vm_insnhelper.c (argument_error): insert dummy frame to make
	  a backtrace object intead of modify backtrace string array.
	  [Bug #9295]

	* test/ruby/test_backtrace.rb: add a test for this patch.
	  fix test to compare a result of Exception#backtrace with
	  a result of Exception#backtrace_locations.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-25 18:28:21 +00:00
naruse
6ee55bed73 merge revision(s) 44381: [Backport #9296]
test_method.rb: fix test

	* test/ruby/test_method.rb (test_define_method_in_private_scope):
  remove extra *, to get the argument itself.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44415 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-25 11:31:01 +00:00
naruse
18f605a292 merge revision(s) 44380: [Backport #9296]
* proc.c (rb_mod_define_method): consider visibility only if self
	  in the caller is same as the receiver, otherwise make public as
	  well as old behavior.  [ruby-core:57747] [Bug #9005]
	  [ruby-core:58497] [Bug #9141]

	* vm.c (rb_vm_cref_in_context): return ruby level cref if self is
	  same.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44410 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-25 07:58:38 +00:00