Make sure ESI includes don't trip the director NULL check in vcl_recv.

Fixes #339

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3262 d4fa192b-c00b-0410-8231-f00ffab90ce4

diff --git a/varnish-cache/bin/varnishd/cache_vrt_esi.c b/varnish-cache/bin/varnishd/cache_vrt_esi.c
index f93be77f9750c59aff23fa2ac4e3627ee248a3a2..e3d80a0d706d262832016bf264cff55f8ed332d9 100644 (file)
--- a/varnish-cache/bin/varnishd/cache_vrt_esi.c
+++ b/varnish-cache/bin/varnishd/cache_vrt_esi.c
@@ -828,6 +828,12 @@ ESI_Deliver(struct sess *sp)
                        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);