r2092 - trunk/varnish-cache/bin/varnishd

[phk at projects.linpro.no]

Author: phk
Date: 2007-10-08 16:12:06 +0200 (Mon, 08 Oct 2007)
New Revision: 2092

Modified:
   trunk/varnish-cache/bin/varnishd/cache_center.c
   trunk/varnish-cache/bin/varnishd/cache_httpconn.c
Log:
More asserts


Modified: trunk/varnish-cache/bin/varnishd/cache_center.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_center.c	2007-10-08 13:20:57 UTC (rev 2091)
+++ trunk/varnish-cache/bin/varnishd/cache_center.c	2007-10-08 14:12:06 UTC (rev 2092)
@@ -789,6 +789,7 @@
 	CHECK_OBJ_NOTNULL(w, WORKER_MAGIC);
 
 	for (done = 0; !done; ) {
+		assert(sp->wrk == w);
 		/*
 		 * This is a good place to be paranoid about the various
 		 * pointers still pointing to the things we expect.

Modified: trunk/varnish-cache/bin/varnishd/cache_httpconn.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_httpconn.c	2007-10-08 13:20:57 UTC (rev 2091)
+++ trunk/varnish-cache/bin/varnishd/cache_httpconn.c	2007-10-08 14:12:06 UTC (rev 2092)
@@ -138,6 +138,7 @@
 	int i;
 
 	CHECK_OBJ_NOTNULL(htc, HTTP_CONN_MAGIC);
+	AN(htc->ws->r);
 	i = (htc->ws->r - htc->rxbuf.e) - 1;	/* space for NUL */
 	if (i <= 0) {
 		WS_ReleaseP(htc->ws, htc->rxbuf.b);