summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-05-29 00:30:02 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-05-29 00:30:02 +0000
commit82f2e90d07ff9b576e010f0cf91d066cfb5d389a (patch)
treefb03d019e0fafe056798ab21bb17ef8b1b783b9d
parentf0371f2f28b0a0138bf7d56efdc481f4627afe00 (diff)
* enum.c (collect_all): checks interrupts. [ruby-core:23594]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23603 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--enum.c1
-rw-r--r--version.h4
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 88ac2b537b..ed889ec006 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri May 29 09:30:00 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * enum.c (collect_all): checks interrupts. [ruby-core:23594]
+
Thu May 28 07:39:22 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (THREAD_MODEL): reject unknown value and checks
diff --git a/enum.c b/enum.c
index 938e3c3e5e..1235d3eb78 100644
--- a/enum.c
+++ b/enum.c
@@ -362,6 +362,7 @@ collect_i(VALUE i, VALUE ary, int argc, VALUE *argv)
static VALUE
collect_all(VALUE i, VALUE ary, int argc, VALUE *argv)
{
+ rb_thread_check_ints();
rb_ary_push(ary, enum_values_pack(argc, argv));
return Qnil;
diff --git a/version.h b/version.h
index de15274aff..761bc7ce32 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2"
-#define RUBY_RELEASE_DATE "2009-05-28"
+#define RUBY_RELEASE_DATE "2009-05-29"
#define RUBY_PATCHLEVEL -1
#define RUBY_BRANCH_NAME "trunk"
@@ -8,7 +8,7 @@
#define RUBY_VERSION_TEENY 1
#define RUBY_RELEASE_YEAR 2009
#define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 28
+#define RUBY_RELEASE_DAY 29
#include "ruby/version.h"