[master] c8a5904 h2: Do a VSL_Flush prior to changing vsl->wid

Dag Haavi Finstad daghf at varnish-software.com
Thu Dec 21 12:44:04 UTC 2017


commit c8a59044eb6b0dde2a5ba99393794479d7d89d08
Author: Dag Haavi Finstad <daghf at varnish-software.com>
Date:   Thu Dec 21 13:41:02 2017 +0100

    h2: Do a VSL_Flush prior to changing vsl->wid
    
    This ensures we don't end up with a VSL batched record with conflicting
    ids, which breaks the -g grouping modes.

diff --git a/bin/varnishd/http2/cache_http2_session.c b/bin/varnishd/http2/cache_http2_session.c
index fcee836..a0fa1dd 100644
--- a/bin/varnishd/http2/cache_http2_session.c
+++ b/bin/varnishd/http2/cache_http2_session.c
@@ -94,6 +94,7 @@ h2_new_sess(const struct worker *wrk, struct sess *sp, struct req *srq)
 		h2->htc = srq->htc;
 		h2->ws = srq->ws;
 		h2->vsl = srq->vsl;
+		VSL_Flush(h2->vsl, 0);
 		h2->vsl->wid = sp->vxid;
 		h2->htc->rfd = &sp->fd;
 		h2->sess = sp;


More information about the varnish-commit mailing list