diff options
| author | shugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-12-03 23:35:45 +0000 |
|---|---|---|
| committer | shugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-12-03 23:35:45 +0000 |
| commit | 97ebd3775369eb33cfab12fce2ef03dbc07ae968 (patch) | |
| tree | ecbad9a292b79e9a43d70b3dbeecd1089b0ca4d0 | |
| parent | c521f57a267cc0cd1a1ca019787b8276cd6eeefd (diff) | |
| download | ruby-97ebd3775369eb33cfab12fce2ef03dbc07ae968.tar.gz ruby-97ebd3775369eb33cfab12fce2ef03dbc07ae968.tar.xz ruby-97ebd3775369eb33cfab12fce2ef03dbc07ae968.zip | |
* lib/cgi.rb (CGI::QueryExtension::read_multipart): should quote
boundary. JVN#84798830
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@11330 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/cgi.rb | 5 |
2 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Mon Dec 4 08:32:49 2006 Shugo Maeda <shugo@ruby-lang.org> + + * lib/cgi.rb (CGI::QueryExtension::read_multipart): should quote + boundary. JVN#84798830 + Sat Dec 2 07:09:04 2006 GOTOU Yuuzou <gotoyuzo@notwork.org> * ext/openssl/ossl_ocsp.c: OpenSSL::OCSP::OSCPError should be diff --git a/lib/cgi.rb b/lib/cgi.rb index aed619157..d937f5819 100644 --- a/lib/cgi.rb +++ b/lib/cgi.rb @@ -967,6 +967,7 @@ class CGI def read_multipart(boundary, content_length) params = Hash.new([]) boundary = "--" + boundary + quoted_boundary = Regexp.quote(boundary, "n") buf = "" bufsize = 10 * 1024 boundary_end="" @@ -998,7 +999,7 @@ class CGI end body.binmode if defined? body.binmode - until head and /#{boundary}(?:#{EOL}|--)/n.match(buf) + until head and /#{quoted_boundary}(?:#{EOL}|--)/n.match(buf) if (not head) and /#{EOL}#{EOL}/n.match(buf) buf = buf.sub(/\A((?:.|\n)*?#{EOL})#{EOL}/n) do @@ -1025,7 +1026,7 @@ class CGI content_length -= c.size end - buf = buf.sub(/\A((?:.|\n)*?)(?:[\r\n]{1,2})?#{boundary}([\r\n]{1,2}|--)/n) do + buf = buf.sub(/\A((?:.|\n)*?)(?:[\r\n]{1,2})?#{quoted_boundary}([\r\n]{1,2}|--)/n) do body.print $1 if "--" == $2 content_length = -1 |