From aa2a6871ee93e5dc86f243045af91fac90f142bf Mon Sep 17 00:00:00 2001
From: wakou <wakou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 13 Jun 2000 15:53:19 +0000
Subject: [PATCH] Wed Jun 14 00:50:14 2000  Wakou Aoyama <wakou@fsinet.or.jp>

        * lib/cig.rb: read_multipart(): if no content body then raise EOFError.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@753 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog  |  4 ++++
 lib/cgi.rb | 17 ++++++++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bfd1db5058..bae4ed0a5a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jun 14 00:50:14 2000  Wakou Aoyama <wakou@fsinet.or.jp>
+
+	* lib/cig.rb: read_multipart(): if no content body then raise EOFError.
+
 Tue Jun 13 11:46:17 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
 	* process.c (proc_setsid): try implement it using setpgrp() and
diff --git a/lib/cgi.rb b/lib/cgi.rb
index a738587e5e..cd0c793e75 100644
--- a/lib/cgi.rb
+++ b/lib/cgi.rb
@@ -5,7 +5,7 @@ $Date$
 
 cgi.rb
 
-Version 1.60
+Version 1.61
 
 Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
 Copyright (C) 2000  Information-technology Promotion Agency, Japan
@@ -185,7 +185,7 @@ class CGI
   EOL = CR + LF
 v = $-v
 $-v = false
-  VERSION = "1.60"
+  VERSION = "1.61"
   RELEASE_DATE = "$Date$"
 $-v = v
 
@@ -752,7 +752,12 @@ convert string charset, and set language to "ja".
 
       # start multipart/form-data
       stdinput.binmode
-      content_length -= stdinput.read((boundary + EOL).size).size
+      boundary_size = boundary.size + EOL.size
+      content_length -= boundary_size
+      status = stdinput.read(boundary_size)
+      if nil == status
+        raise EOFError, "no content body"
+      end
 
       require "tempfile"
 
@@ -1903,6 +1908,12 @@ end
 
 == HISTORY
 
+=== Version 1.61 - wakou
+
+2000/06/13 15:49:27
+
+- read_multipart(): if no content body then raise EOFError.
+
 === Version 1.60 - wakou
 
 2000/06/03 18:16:17