diff --git a/ChangeLog b/ChangeLog
index ed34172..ac350a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-14  Marek Habersack  <mhabersack@novell.com>
+
+	* src/Mono.WebServer.Apache/ModMonoRequest.cs: fill the buffer
+	when reading the client block. Fixes bug #408723
+
 2008-07-11  Marek Habersack  <mhabersack@novell.com>
 
 	* src/Mono.WebServer.Apache/Worker.cs: RequestReader is created
diff --git a/src/Mono.WebServer.Apache/ModMonoRequest.cs b/src/Mono.WebServer.Apache/ModMonoRequest.cs
index 098f3b1..1f9320d 100644
--- a/src/Mono.WebServer.Apache/ModMonoRequest.cs
+++ b/src/Mono.WebServer.Apache/ModMonoRequest.cs
@@ -508,6 +508,7 @@ namespace Mono.WebServer
 			writer.Write (size);
 			Send ();
 			
+			FillBuffer (4);
 			int i = reader.ReadInt32 ();
 			if (i == -1)
 				return -1;
@@ -515,6 +516,7 @@ namespace Mono.WebServer
 			if (i > size)
 				throw new Exception ("Houston...");
 
+			FillBuffer (i);
 			return reader.Read (bytes, position, i);
 		}