summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-02-13 14:12:55 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-02-13 14:12:55 +0000
commitf7f23c5b3e6cc349f6557537096cbff9089f8ace (patch)
treecfca32ea387d8dc763a336ec7d33be9e49674494
parent184af94a44abe3cdbb58866d0878f7f246a990a2 (diff)
downloadruby-f7f23c5b3e6cc349f6557537096cbff9089f8ace.tar.gz
ruby-f7f23c5b3e6cc349f6557537096cbff9089f8ace.tar.xz
ruby-f7f23c5b3e6cc349f6557537096cbff9089f8ace.zip
* eval.c (rb_thread_start_0): restore prot_tag before rewinding.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@7964 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--eval.c2
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5853d7bad..b920ed293 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
+Sun Feb 13 23:12:47 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (rb_thread_start_0): restore prot_tag before rewinding.
+
Sun Feb 13 16:56:52 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
- * lib/webrick/cgi.rb (WEBrick::CGI.start): should set reason-phrase
+ * lib/webrick/cgi.rb (WEBrick::CGI.start): should set reason-phrase
to the value of status header field. ([ruby-dev:40617])
Sun Feb 13 11:38:40 2005 Kazuo Saito <ksaito@uranus.dti.ne.jp>
diff --git a/eval.c b/eval.c
index 662af1206..ad7465630 100644
--- a/eval.c
+++ b/eval.c
@@ -11652,7 +11652,7 @@ rb_thread_start_0(fn, arg, th)
new_thread.proc = rb_block_proc();
new_thread.arg = (VALUE)arg;
th->anchor = ip;
- longjmp(ip->tag->buf, TAG_THREAD);
+ longjmp((prot_tag = ip->tag)->buf, TAG_THREAD);
}
if (ruby_block) { /* should nail down higher blocks */