r4074 - trunk/varnish-cache/bin/varnishd
phk at projects.linpro.no
phk at projects.linpro.no
Mon May 11 12:57:40 CEST 2009
Author: phk
Date: 2009-05-11 12:57:39 +0200 (Mon, 11 May 2009)
New Revision: 4074
Modified:
trunk/varnish-cache/bin/varnishd/cache_esi.c
Log:
Snapshot the worker threads workspace between esi includes.
Modified: trunk/varnish-cache/bin/varnishd/cache_esi.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_esi.c 2009-05-11 10:37:31 UTC (rev 4073)
+++ trunk/varnish-cache/bin/varnishd/cache_esi.c 2009-05-11 10:57:39 UTC (rev 4074)
@@ -760,7 +760,7 @@
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 @@
/* 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 @@
/* 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)
More information about the varnish-commit
mailing list