Snapshot the worker threads workspace between esi includes.

git-svn-id: http://www.varnish-cache.org/svn/trunk/varnish-cache@4074 d4fa192b-c00b-0410-8231-f00ffab90ce4

bin/varnishd/cache_esi.c

@@ -760,7 +760,7 @@ ESI_Deliver(struct sess *sp)
 	struct esi_bit *eb;
 	struct object *obj;
 	struct worker *w;
-	char *ws_wm;
+	char *ws_wm, *wws_wm;
 	struct http http_save;
 
 	w = sp->wrk;
@@ -797,6 +797,7 @@ ESI_Deliver(struct sess *sp)
 
 		/* Take a workspace snapshot */
 		ws_wm = WS_Snapshot(sp->ws);
+		wws_wm = WS_Snapshot(sp->wrk->ws);
 
 		http_SetH(sp->http, HTTP_HDR_URL, eb->include.b);
 		if (eb->host.b != NULL)  {
@@ -837,6 +838,7 @@ ESI_Deliver(struct sess *sp)
 
 		/* Reset the workspace */
 		WS_Reset(sp->ws, ws_wm);
+		WS_Reset(sp->wrk->ws, wws_wm);
 
 		WRW_Reserve(sp->wrk, &sp->fd);
 		if (sp->fd < 0)