summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-06-08 08:49:24 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-06-08 08:49:24 +0000
commit364491de5d755ce9c5cf95fce4516e06bf0b55ea (patch)
tree3483181081e69715a964359c3f5b85256942cadf
parentb27cbbab474270d43df769aec9bcbfee624fb602 (diff)
downloadruby-364491de5d755ce9c5cf95fce4516e06bf0b55ea.tar.gz
ruby-364491de5d755ce9c5cf95fce4516e06bf0b55ea.tar.xz
ruby-364491de5d755ce9c5cf95fce4516e06bf0b55ea.zip
* eval.c (rb_eval_cmd): just return if no exceptions.
[ruby-dev:30820] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_6@12483 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--eval.c5
2 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 38e637c39..b5e65e87a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed May 30 04:29:43 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (thread_timer): timer thread should not receive any
+ signals. submitted by Sylvain Joyeux. [ruby-core:08546]
+
Wed May 30 04:18:37 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (rb_eval_cmd): just return if no exceptions.
diff --git a/eval.c b/eval.c
index 4b057afb6..ccb25c84f 100644
--- a/eval.c
+++ b/eval.c
@@ -11781,6 +11781,11 @@ thread_timer(dummy)
#define test_cancel() /* void */
#endif
+ sigset_t all_signals;
+
+ sigfillset(&all_signals);
+ pthread_sigmask(SIG_BLOCK, &all_signals, 0);
+
for (;;) {
#ifdef HAVE_NANOSLEEP
struct timespec req, rem;