diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-10-29 01:06:37 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-10-29 01:06:37 +0000 |
| commit | 55bb4f8888258e713d8688ed0409ccde6d98fc29 (patch) | |
| tree | d4ece0f48f7c4590b4a3de54f4461b0c2365cfa7 | |
| parent | 8e13b72e54f2542e5846e7ab1afed2ec2c2b9c14 (diff) | |
| download | ruby-55bb4f8888258e713d8688ed0409ccde6d98fc29.tar.gz ruby-55bb4f8888258e713d8688ed0409ccde6d98fc29.tar.xz ruby-55bb4f8888258e713d8688ed0409ccde6d98fc29.zip | |
* eval.c (ruby_cleanup): ruby_finalize_1 may cause exception,
should be wrapped by PUSH_TAG/POP_TAG(). [ruby-dev:24627]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@7127 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | eval.c | 2 | ||||
| -rw-r--r-- | lib/cgi.rb | 2 |
3 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Fri Oct 29 10:00:30 2004 Yukihiro Matsumoto <matz@ruby-lang.org> + + * eval.c (ruby_cleanup): ruby_finalize_1 may cause exception, + should be wrapped by PUSH_TAG/POP_TAG(). [ruby-dev:24627] + Thu Oct 28 23:32:54 2004 akira yamada <akira@ruby-lang.org> * ext/zlib/zlib.c (zstream_detach_input): resets klass of z->input if @@ -1432,9 +1432,9 @@ ruby_cleanup(ex) POP_ITER(); ruby_errinfo = err; ex = error_handle(ex); + ruby_finalize_1(); POP_TAG(); - ruby_finalize_1(); if (err && rb_obj_is_kind_of(err, rb_eSystemExit)) { VALUE st = rb_iv_get(err, "status"); return NUM2INT(st); diff --git a/lib/cgi.rb b/lib/cgi.rb index fc0913349..b68ee803e 100644 --- a/lib/cgi.rb +++ b/lib/cgi.rb @@ -1023,7 +1023,7 @@ class CGI content_length -= c.size end - buf = buf.sub(/\A((?:.|\n)*?)(?:#{EOL})?#{boundary}(#{EOL}|--)/n) do + buf = buf.sub(/\A((?:.|\n)*?)(?:#{EOL})?#{boundary}(#{EOL}|#{LF}|--)/n) do body.print $1 if "--" == $2 content_length = -1 |