r3262 - trunk/varnish-cache/bin/varnishd

[phk at projects.linpro.no]

Author: phk
Date: 2008-10-07 12:57:35 +0200 (Tue, 07 Oct 2008)
New Revision: 3262

Modified:
   trunk/varnish-cache/bin/varnishd/cache_vrt_esi.c
Log:
Make sure ESI includes don't trip the director NULL check in vcl_recv.

Fixes #339



Modified: trunk/varnish-cache/bin/varnishd/cache_vrt_esi.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_vrt_esi.c	2008-10-07 09:46:24 UTC (rev 3261)
+++ trunk/varnish-cache/bin/varnishd/cache_vrt_esi.c	2008-10-07 10:57:35 UTC (rev 3262)
@@ -828,6 +828,12 @@
 			http_Unset(sp->http, H_If_Modified_Since);
 			http_SetHeader(sp->wrk, sp->fd, sp->http, eb->host.b);
 		}
+		/*
+		 * XXX: We should decide if we should cache the director
+		 * XXX: or not (for session/backend coupling).  Until then
+		 * XXX: make sure we don't trip up the check in vcl_recv.
+		 */
+		sp->director = NULL;
 		sp->step = STP_RECV;
 		http_ForceGet(sp->http);
 		http_Unset(sp->http, H_Content_Length);