r143 - trunk/varnish-cache/bin/varnishd

[phk at projects.linpro.no]

Author: phk
Date: 2006-04-19 08:38:57 +0200 (Wed, 19 Apr 2006)
New Revision: 143

Modified:
   trunk/varnish-cache/bin/varnishd/cache_fetch.c
Log:
Loop until we have read it all


Modified: trunk/varnish-cache/bin/varnishd/cache_fetch.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_fetch.c	2006-04-19 06:34:10 UTC (rev 142)
+++ trunk/varnish-cache/bin/varnishd/cache_fetch.c	2006-04-19 06:38:57 UTC (rev 143)
@@ -91,10 +91,13 @@
 		p += i;
 		cl -= i;
 	}
-	if (cl != 0) {
+
+	while (cl != 0) {
 		i = read(sp2.fd, p, cl);
+		assert(i > 0);
 		VSL(SLT_Debug, 0, "R i %d cl %jd", i, cl);
-		assert(i == cl);
+		p += i;
+		cl -= i;
 	}
 
 	HttpdBuildSbuf(1, 1, w->sb, &sp2);