[master] 8bc3ff038 Polish: Move assertion to V1L_Open()
Nils Goroll
nils.goroll at uplex.de
Sat Apr 8 05:13:05 UTC 2023
commit 8bc3ff0384d09f90a35d95927f6350a8aef831e9
Author: Nils Goroll <nils.goroll at uplex.de>
Date: Sat Apr 8 07:10:02 2023 +0200
Polish: Move assertion to V1L_Open()
... that there is no v1l open already for the worker.
This enables the assertion also for use on the backend side.
diff --git a/bin/varnishd/http1/cache_http1_deliver.c b/bin/varnishd/http1/cache_http1_deliver.c
index 9d424b4d0..0d0b1bf39 100644
--- a/bin/varnishd/http1/cache_http1_deliver.c
+++ b/bin/varnishd/http1/cache_http1_deliver.c
@@ -138,7 +138,6 @@ V1D_Deliver(struct req *req, struct boc *boc, int sendbody)
return;
}
- AZ(req->wrk->v1l);
V1L_Open(req->wrk, req->wrk->aws, &req->sp->fd, req->vsl,
req->t_prev + SESS_TMO(req->sp, send_timeout),
cache_param->http1_iovs);
diff --git a/bin/varnishd/http1/cache_http1_line.c b/bin/varnishd/http1/cache_http1_line.c
index ac14d8cb7..c435fdd32 100644
--- a/bin/varnishd/http1/cache_http1_line.c
+++ b/bin/varnishd/http1/cache_http1_line.c
@@ -119,6 +119,8 @@ V1L_Open(struct worker *wrk, struct ws *ws, int *fd, struct vsl_log *vsl,
v1l->deadline = deadline;
v1l->vsl = vsl;
v1l->werr = SC_NULL;
+
+ AZ(wrk->v1l);
wrk->v1l = v1l;
WS_Release(ws, u * sizeof(struct iovec));
More information about the varnish-commit
mailing list