mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
Rolled out last change
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25794 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
36ed53ff93
commit
ca7b32630c
1 changed files with 4 additions and 3 deletions
|
@ -426,7 +426,7 @@ class CGI
|
|||
raise EOFError.new("no content body") unless status
|
||||
raise EOFError.new("bad content body") unless first_line == status
|
||||
## parse and set params
|
||||
params = Hash.new { |h,k| h[k] = [] }
|
||||
params = {}
|
||||
@files = {}
|
||||
boundary_rexp = /--#{Regexp.quote(boundary)}(#{EOL}|--)/
|
||||
boundary_size = "#{EOL}--#{boundary}#{EOL}".bytesize
|
||||
|
@ -496,7 +496,7 @@ class CGI
|
|||
name = $1 || $2 || ''
|
||||
if body.original_filename.empty?
|
||||
value=body.read.dup.force_encoding(@accept_charset)
|
||||
params[name] << value
|
||||
(params[name] ||= []) << value
|
||||
unless value.valid_encoding?
|
||||
if @accept_charset_error_block
|
||||
@accept_charset_error_block.call(name,value)
|
||||
|
@ -510,7 +510,7 @@ class CGI
|
|||
define_method(:content_type){""}
|
||||
end
|
||||
else
|
||||
params[name] << body
|
||||
(params[name] ||= []) << body
|
||||
@files[name]=body
|
||||
end
|
||||
## break loop
|
||||
|
@ -518,6 +518,7 @@ class CGI
|
|||
break if content_length == -1
|
||||
end
|
||||
raise EOFError, "bad boundary end of body part" unless boundary_end =~ /--/
|
||||
params.default = []
|
||||
params
|
||||
end # read_multipart
|
||||
private :read_multipart
|
||||
|
|
Loading…
Reference in a new issue