diff --git a/ChangeLog b/ChangeLog
index 02ac249461..1714a9fb01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue May 17 15:31:31 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/httpserver.rb (WEBrick::HTTPServer#run): should 
+	  break the loop if the socket reached to EOF. [ruby-talk:142285]
+
 Tue May 17 11:52:18 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.c (unixtime_to_filetime): use localtime() instead of
diff --git a/lib/webrick/httpserver.rb b/lib/webrick/httpserver.rb
index 06d2ea1b6c..ccb656299d 100644
--- a/lib/webrick/httpserver.rb
+++ b/lib/webrick/httpserver.rb
@@ -52,7 +52,7 @@ module WEBrick
             timeout = 0 if @status != :Running
             timeout -= 0.5
           end
-          raise HTTPStatus::EOFError if timeout <= 0
+          raise HTTPStatus::EOFError if timeout <= 0 || sock.eof?
           req.parse(sock)
           res.request_method = req.request_method
           res.request_uri = req.request_uri