nagachika	2017-02-08 01:45:42 +0900 (Wed, 08 Feb 2017)

  New Revision: 57568

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=57568

  Log:
    merge revision(s) 56928: [Backport #12991]
    
    thread.c: fix doc of abort_on_exception [ci skip]
    
    * thread.c (rb_thread_s_abort_exc, rb_thread_s_abort_exc_set):
      [DOC] the raised exception will be re-raised in the main thread,
      and then follows the ordinary exception sequence, exit status is
      not 0.  [ruby-core:78415] [Bug #12991]
    
    * thread.c (rb_thread_abort_exc_set): ditto.

  Modified directories:
    branches/ruby_2_3/
  Modified files:
    branches/ruby_2_3/thread.c
    branches/ruby_2_3/version.h
Index: ruby_2_3/version.h
===================================================================
--- ruby_2_3/version.h	(revision 57567)
+++ ruby_2_3/version.h	(revision 57568)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1
 #define RUBY_VERSION "2.3.3"
 #define RUBY_RELEASE_DATE "2017-02-08"
-#define RUBY_PATCHLEVEL 240
+#define RUBY_PATCHLEVEL 241
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 2
Index: ruby_2_3/thread.c
===================================================================
--- ruby_2_3/thread.c	(revision 57567)
+++ ruby_2_3/thread.c	(revision 57568)
@@ -2486,8 +2486,8 @@ rb_thread_s_main(VALUE klass) https://github.com/ruby/ruby/blob/trunk/ruby_2_3/thread.c#L2486
  *
  *  The default is +false+.
  *
- *  When set to +true+, all threads will abort (the process will
- *  <code>exit(0)</code>) if an exception is raised in any thread.
+ *  When set to +true+, if any thread is aborted by an exception, the
+ *  raised exception will be re-raised in the main thread.
  *
  *  Can also be specified by the global $DEBUG flag or command line option
  *  +-d+.
@@ -2509,7 +2509,8 @@ rb_thread_s_abort_exc(void) https://github.com/ruby/ruby/blob/trunk/ruby_2_3/thread.c#L2509
  *  call-seq:
  *     Thread.abort_on_exception= boolean   -> true or false
  *
- *  When set to +true+, all threads will abort if an exception is raised.
+ *  When set to +true+, if any thread is aborted by an exception, the
+ *  raised exception will be re-raised in the main thread.
  *  Returns the new state.
  *
  *     Thread.abort_on_exception = true
@@ -2570,10 +2571,8 @@ rb_thread_abort_exc(VALUE thread) https://github.com/ruby/ruby/blob/trunk/ruby_2_3/thread.c#L2571
  *  call-seq:
  *     thr.abort_on_exception= boolean   -> true or false
  *
- *  When set to +true+, all threads (including the main program) will abort if
- *  an exception is raised in this +thr+.
- *
- *  The process will effectively <code>exit(0)</code>.
+ *  When set to +true+, if this +thr+ is aborted by an exception, the
+ *  raised exception will be re-raised in the main thread.
  *
  *  See also #abort_on_exception.
  *

Property changes on: ruby_2_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r56928


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/