diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-07-24 05:18:47 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-07-24 05:18:47 +0000 |
commit | e02b469de182c1d87ead38fa82630eaaee75c379 (patch) | |
tree | 425980c3ebfb78d38067b3b01f2df97a9dc0853d /lib/cgi.rb | |
parent | 169300a4f8f6c704d9ef1dbed0b73f2dd7efdb68 (diff) |
* eval.c (thgroup_add): no warning for terminated threads.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4142 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/cgi.rb')
-rw-r--r-- | lib/cgi.rb | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/lib/cgi.rb b/lib/cgi.rb index 8f522ab7c1..1327b64d34 100644 --- a/lib/cgi.rb +++ b/lib/cgi.rb @@ -800,7 +800,7 @@ convert string charset, and set language to "ja". body = Tempfile.new("CGI") else begin - require "stringio" if not defined? StringIO + require "stringio" body = StringIO.new rescue LoadError require "tempfile" @@ -917,6 +917,7 @@ convert string charset, and set language to "ja". if ("POST" == env_table['REQUEST_METHOD']) and %r|\Amultipart/form-data.*boundary=\"?([^\";,]+)\"?|n.match(env_table['CONTENT_TYPE']) boundary = $1.dup + @multipart = true @params = read_multipart(boundary, Integer(env_table['CONTENT_LENGTH'])) else @params = CGI::parse( @@ -947,7 +948,6 @@ convert string charset, and set language to "ja". super(str) end def [](idx) - p caller(1) warn "#{caller(1)[0]}:CAUTION! cgi['key'] == cgi.params['key'][0]; if want Array, use cgi.params['key']" self end @@ -964,8 +964,17 @@ convert string charset, and set language to "ja". def [](key) params = @params[key] value = params[0] - value ||= "" - Value.new(value,params) + if @multipart + if value + return value + elsif defined? StringIO + StringIO.new("") + else + Tempfile.new("CGI") + end + else + Value.new(value || "", params) + end end def keys(*args) @@ -1931,6 +1940,7 @@ The hash keys are case sensitive. Ask the samples. end extend QueryExtension + @multipart = false if "POST" != env_table['REQUEST_METHOD'] initialize_query() # set @params, @cookies else |