[experimental-ims] 71ee192 Merge backend conditional requests with 3.0.1
Geoff Simmons
geoff at varnish-cache.org
Wed Aug 31 16:05:06 CEST 2011
commit 71ee192bcecadb609f7147e5da73578e196b52d9
Merge: 13a0986 a36f0ed
Author: Geoff Simmons <geoff at uplex.de>
Date: Wed Aug 31 15:59:11 2011 +0200
Merge backend conditional requests with 3.0.1
diff --cc bin/varnishd/cache_fetch.c
index e39b358,b3704b4..196d25b
--- a/bin/varnishd/cache_fetch.c
+++ b/bin/varnishd/cache_fetch.c
@@@ -496,14 -496,14 +496,20 @@@ FetchBody(struct sess *sp
sp->wrk->vfp = &vfp_nop;
AN(sp->director);
- AssertObjPassOrBusy(sp->obj);
+ AssertObjCorePassOrBusy(sp->obj->objcore);
+
+ /* If we've freshened from another object and got a "Not Modified"
+ * response, then we have already duped the other object's body.
+ */
+ if (sp->wrk->beresp->status != 304)
+ AZ(VTAILQ_FIRST(&sp->obj->store));
+ /* If we've freshened from another object and got a "Not Modified"
+ * response, then we have already duped the other object's body.
+ */
+ if (sp->wrk->beresp->status != 304)
+ AZ(VTAILQ_FIRST(&sp->obj->store));
+
AZ(sp->wrk->vgz_rx);
switch (sp->wrk->body_status) {
case BS_NONE:
More information about the varnish-commit
mailing list