2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 3bd98eba8e..e90278482c 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 08:35:53 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/rdoc/ri/ri_options.rb: prevent NameError.  [ruby-dev:29597]
diff --git a/lib/cgi.rb b/lib/cgi.rb
index dc4d9ebec3..aed6191576 100644
--- a/lib/cgi.rb
+++ b/lib/cgi.rb
@@ -1018,7 +1018,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)