summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--thread.c13
-rw-r--r--version.h2
2 files changed, 7 insertions, 8 deletions
diff --git a/thread.c b/thread.c
index dade49726f..e48c05e996 100644
--- a/thread.c
+++ b/thread.c
@@ -2486,8 +2486,8 @@ rb_thread_s_main(VALUE klass)
*
* 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)
* 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)
* 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.
*
diff --git a/version.h b/version.h
index bd793edead..d1cb2d7c8f 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#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