diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-11-01 23:49:16 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-11-01 23:49:16 +0000 |
| commit | 89a30ab99fc4f48c3b95389255140ab624369c33 (patch) | |
| tree | 90aeb9eeaa0c42b52312e1875433b2dafea4c52f /lib | |
| parent | 4058e0bbefcc0c82b725b7dba0ac00de405b8d01 (diff) | |
| download | ruby-89a30ab99fc4f48c3b95389255140ab624369c33.tar.gz ruby-89a30ab99fc4f48c3b95389255140ab624369c33.tar.xz ruby-89a30ab99fc4f48c3b95389255140ab624369c33.zip | |
* eval.c (proc_invoke): nail down dyna_var node when Proc object
or continuation is created. [ruby-dev:24671]
* io.c (rb_io_s_popen): do not expand argv array. [ruby-dev:24670]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@7174 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/cgi.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/cgi.rb b/lib/cgi.rb index 9f3f7c0e0..22544d905 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}|#{LF}|--)/n) do + buf = buf.sub(/\A((?:.|\n)*?)(?:[\r\n]{1,2})?#{boundary}([\r\n]{1,2}|--)/n) do body.print $1 if "--" == $2 content_length = -1 |