[master] bf8b317 Forgot the conditional case in previous fix.
Poul-Henning Kamp
phk at FreeBSD.org
Tue Dec 3 13:33:48 CET 2013
commit bf8b317fb81a6253d39f3196b6b087ee75e70bee
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Tue Dec 3 12:33:30 2013 +0000
Forgot the conditional case in previous fix.
diff --git a/bin/varnishd/cache/cache_fetch.c b/bin/varnishd/cache/cache_fetch.c
index e8b4914..ae72c62 100644
--- a/bin/varnishd/cache/cache_fetch.c
+++ b/bin/varnishd/cache/cache_fetch.c
@@ -562,7 +562,6 @@ vbf_stp_condfetch(struct worker *wrk, struct busyobj *bo)
VDI_CloseFd(&bo->vbc);
return (F_STP_DONE);
}
- bo->stats = NULL;
AZ(bo->fetch_obj);
bo->fetch_obj = obj;
@@ -621,6 +620,7 @@ vbf_stp_condfetch(struct worker *wrk, struct busyobj *bo)
}
} while (ois == OIS_DATA || ois == OIS_STREAM);
ObjIterEnd(&oi);
+ bo->stats = NULL;
assert(al == bo->ims_obj->len);
assert(obj->len == al);
if (bo->state != BOS_FAILED)
More information about the varnish-commit
mailing list