Mailing List Archive

r1505 - trunk/varnish-cache/bin/varnishd
Author: phk
Date: 2007-06-10 09:47:50 +0200 (Sun, 10 Jun 2007)
New Revision: 1505

Modified:
trunk/varnish-cache/bin/varnishd/cache_http.c
Log:
Fix a bug I introduced in the workspace rewamp: Don't throw away
perfectly good pipelined data.



Modified: trunk/varnish-cache/bin/varnishd/cache_http.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_http.c 2007-06-10 07:19:21 UTC (rev 1504)
+++ trunk/varnish-cache/bin/varnishd/cache_http.c 2007-06-10 07:47:50 UTC (rev 1505)
@@ -361,7 +361,8 @@
b += u;
len -= u;
}
- hp->pl_s = hp->pl_e = NULL;
+ if (hp->pl_e == hp->pl_s)
+ hp->pl_s = hp->pl_e = NULL;
if (len > 0) {
i = read(fd, b, len);
if (i < 0)
r1505 - trunk/varnish-cache/bin/varnishd [ In reply to ]
phk at projects.linpro.no writes:
> Log:
> Fix a bug I introduced in the workspace rewamp: Don't throw away
> perfectly good pipelined data.

Actually, this commit breaks our regression test for #102:

des at des ~/projects/varnish/trunk/varnish-tools/regress% ./varnish-regress.pl 102
[...]
CLI: Tx| POST / HTTP/1.1
CLI: Tx|
VAR: Cache child died pid=15715 status=0x8b
VAR: Clean child
VAR: Child cleaned

(status=0x8b is a segfault)

DES
--
Dag-Erling Sm?rgrav
Senior Software Developer
Linpro AS - www.linpro.no