summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-10-29 01:06:37 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-10-29 01:06:37 +0000
commitce3c39c09b9a0c20c875a27a051f51ef808904d6 (patch)
treefe00484c17f89c209107da7e600aa716996b4c16 /lib
parent31bb1cb763e9b608e583a484c5e97d75d42c3990 (diff)
downloadruby-ce3c39c09b9a0c20c875a27a051f51ef808904d6.tar.gz
ruby-ce3c39c09b9a0c20c875a27a051f51ef808904d6.tar.xz
ruby-ce3c39c09b9a0c20c875a27a051f51ef808904d6.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/trunk@7127 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/cgi.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/cgi.rb b/lib/cgi.rb
index afc99ab7c..9f3f7c0e0 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