[master] 51127b460 Avoid double log ending of h2 sessions
Nils Goroll
nils.goroll at uplex.de
Wed Apr 24 11:41:08 UTC 2019
commit 51127b4600f095fb086c5115905b90ea91731d4f
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date: Fri Apr 19 10:29:04 2019 +0200
Avoid double log ending of h2 sessions
diff --git a/bin/varnishd/cache/cache_req.c b/bin/varnishd/cache/cache_req.c
index c6abfe1ae..def146b04 100644
--- a/bin/varnishd/cache/cache_req.c
+++ b/bin/varnishd/cache/cache_req.c
@@ -220,8 +220,12 @@ Req_Cleanup(struct sess *sp, struct worker *wrk, struct req *req)
/* Charge and log byte counters */
req_AcctLogCharge(wrk->stats, req);
- if (req->vsl->wid)
- VSL_End(req->vsl);
+ if (req->vsl->wid) {
+ if (req->vsl->wid != sp->vxid)
+ VSL_End(req->vsl);
+ else
+ req->vsl->wid = 0; /* ending an h2 stream 0 */
+ }
if (!isnan(req->t_prev) && req->t_prev > 0. && req->t_prev > sp->t_idle)
sp->t_idle = req->t_prev;
More information about the varnish-commit
mailing list