diff --git a/ChangeLog b/ChangeLog
index f82873c1..bbe2d745 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-05-10  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Fixed the bug that SocketCore::isReadable() prevents aria2 from
+	processing 0 length request.	
+	* src/HttpServerBodyCommand.cc
+
 2009-05-09  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Removed --enable-http-server and --http-server-listen-port
diff --git a/src/HttpServerBodyCommand.cc b/src/HttpServerBodyCommand.cc
index 6ed81ec5..04d57647 100644
--- a/src/HttpServerBodyCommand.cc
+++ b/src/HttpServerBodyCommand.cc
@@ -74,15 +74,13 @@ bool HttpServerBodyCommand::execute()
   if(_e->_requestGroupMan->downloadFinished() || _e->isHaltRequested()) {
     return true;
   }
-  if(_socket->isReadable(0)) {
+  if(_socket->isReadable(0) || _httpServer->getContentLength() == 0) {
     _timeout.reset();
 
     try {
       if(_httpServer->receiveBody()) {
 	// Do something for requestpath and body
 	if(_httpServer->getRequestPath() == "/rpc") {
-	  // For xml-rpc, disable keep-alive
-	  //_httpServer->disableKeepAlive();
 	  xmlrpc::XmlRpcRequest req =
 	    xmlrpc::XmlRpcRequestProcessor().parseMemory(_httpServer->getBody());