2005-08-26 Gonzalo Paniagua Javier <gonzalo@ximian.com>

	* XSPWorkerRequest.cs: if we get a 0, don't pretend we read up to 'size'.
	* XSPApplicationHost.cs: returning 0 in Read is fine.


svn path=/trunk/xsp/; revision=48870

ChangeLog

@@ -1,3 +1,9 @@
+2005-08-26 Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* src/Mono.WebServer/XSPWorkerRequest.cs: if we get a 0, don't pretend
+	we read up to 'size'.
+	* src/Mono.WebServer/XSPApplicationHost.cs: returning 0 in Read is fine.
+
 2005-08-26 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
 	* src/Mono.WebServer/XSPWorkerRequest.cs: if we get a -1 when reading

src/Mono.WebServer/XSPApplicationHost.cs

@@ -304,7 +304,7 @@ public void Run (object state)
 		public int Read (byte[] buffer, int position, int size)
 		{
 			int n = stream.Read (buffer, position, size);
-			return (n > 0) ? n : -1;
+			return (n >= 0) ? n : -1;
 		}
 
 		public void Write (byte[] buffer, int position, int size)

src/Mono.WebServer/XSPWorkerRequest.cs

@@ -594,21 +594,22 @@ int ReadInput (byte [] buffer, int offset, int size)
 					return length;
 			}
 
-			int localsize = size;
-			while (localsize > 0) {
+			int localsize = 0;
+			while (size > 0) {
 				byte[] readBuffer;
-				int read = requestBroker.Read (requestId, localsize, out readBuffer);
+				int read = requestBroker.Read (requestId, size, out readBuffer);
 				if (read == 0)
 					break;
 
 				if (read < 0)
 					throw new HttpException (500, "Error reading request.");
 				Buffer.BlockCopy (readBuffer, 0, buffer, offset, read);
 				offset += read;
-				localsize -= read;
+				size -= read;
+				localsize += read;
 			}
 
-			return (length + size);
+			return (length + localsize);
 		}
 
 		public override int ReadEntityBody (byte [] buffer, int size)