summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorryan <ryan@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-11-16 03:57:14 +0000
committerryan <ryan@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-11-16 03:57:14 +0000
commitffe69c2d6ad14af6c536c7ce90fff4652c2ff27c (patch)
tree41d7d54b337fd84842fd111f0865674f5b96ead8 /lib
parentad3fa7afd197cd1b2a38964065e44dbc831bf69b (diff)
Rolled out last change
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@25793 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/cgi.rb9
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/cgi.rb b/lib/cgi.rb
index 87ef8f7cbe..8598cff6c6 100644
--- a/lib/cgi.rb
+++ b/lib/cgi.rb
@@ -971,7 +971,7 @@ class CGI
end
def read_multipart(boundary, content_length)
- params = Hash.new { |h,k| h[k] = [] }
+ params = Hash.new([])
boundary = "--" + boundary
quoted_boundary = Regexp.quote(boundary, "n")
buf = ""
@@ -1063,8 +1063,11 @@ class CGI
/Content-Disposition:.* name="?([^\";\s]*)"?/ni.match(head)
name = $1.dup
- params[name].push(body)
-
+ if params.has_key?(name)
+ params[name].push(body)
+ else
+ params[name] = [body]
+ end
break if buf.size == 0
break if content_length == -1
end