r4423 - trunk/varnish-cache/bin/varnishd

[phk at projects.linpro.no]

Author: phk
Date: 2010-01-06 16:50:42 +0100 (Wed, 06 Jan 2010)
New Revision: 4423

Modified:
   trunk/varnish-cache/bin/varnishd/cache_esi.c
Log:
Write the ESI includ URL into the correct workspace.

NB: This fixes bad ESI-breakage I introduced in r4351 on 2009-11-16 12:44:03

NB: This breakage has not affected the 2.x branch.



Modified: trunk/varnish-cache/bin/varnishd/cache_esi.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_esi.c	2010-01-06 09:42:34 UTC (rev 4422)
+++ trunk/varnish-cache/bin/varnishd/cache_esi.c	2010-01-06 15:50:42 UTC (rev 4423)
@@ -435,13 +435,13 @@
 				tag.e = q + 1;
 
 			u = WS_Reserve(ew->sp->wrk->ws, 0);
-			v = snprintf(ws->f, u - 1, "%.*s%.*s",
+			v = snprintf(ew->sp->wrk->ws->f, u - 1, "%.*s%.*s",
 			    pdiff(tag.b, tag.e), tag.b,
 			    pdiff(val.b, val.e), val.b);
 			v++;
 			xxxassert(v < u);
-			eb->include.b = ws->f;
-			eb->include.e = ws->f + v;
+			eb->include.b = ew->sp->wrk->ws->f;
+			eb->include.e = ew->sp->wrk->ws->f + v;
 			WS_Release(ew->sp->wrk->ws, v);
 		}
 		if (eb->include.b != NULL)