aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-09-23 12:47:11 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-09-23 12:47:11 +0000
commit9911bca1e2774c959993093814c46f05b3c8b7ff (patch)
tree38ccdc6efab3019fbfa1857f16c9417cdaba9f30
parentd5a00279f44dcb9dcd37c767bcd2c51a5101431d (diff)
downloadruby-9911bca1e2774c959993093814c46f05b3c8b7ff.tar.gz
* lib/cgi.rb (CGI::QueryExtension::read_multipart): CGI content
may be empty. a patch from Jamis Buck <jamis at 37signals.com>. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10999 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/cgi.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 74292afc14..9d212645a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Sep 23 21:34:15 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * lib/cgi.rb (CGI::QueryExtension::read_multipart): CGI content
+ may be empty. a patch from Jamis Buck <jamis at 37signals.com>.
+
Sat Sep 23 20:54:28 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
* oniguruma.h: Version 4.4.4
diff --git a/lib/cgi.rb b/lib/cgi.rb
index 8d6705c44a..a10e46eaac 100644
--- a/lib/cgi.rb
+++ b/lib/cgi.rb
@@ -1015,7 +1015,7 @@ class CGI
else
stdinput.read(content_length)
end
- if c.nil?
+ if c.nil? || c.empty?
raise EOFError, "bad content body"
end
buf.concat(c)