[6.0] 46d4d5941 Revert "Fix WS_Reserve() error handling"
Reza Naghibi
reza at naghibi.com
Wed Aug 19 13:15:07 UTC 2020
commit 46d4d594157583cab7886b032aa11ff848ff7c51
Author: Reza Naghibi <reza at naghibi.com>
Date: Mon Aug 17 10:11:54 2020 -0400
Revert "Fix WS_Reserve() error handling"
This reverts commit 0e32f1667ea55156fc2a7fa84e3f1080a05bcb2e.
Conflicts:
bin/varnishd/http2/cache_http2_deliver.c
diff --git a/bin/varnishd/http2/cache_http2_deliver.c b/bin/varnishd/http2/cache_http2_deliver.c
index 304dab2de..ceb2b46c3 100644
--- a/bin/varnishd/http2/cache_http2_deliver.c
+++ b/bin/varnishd/http2/cache_http2_deliver.c
@@ -230,10 +230,8 @@ h2_build_headers(struct vsb *resp, struct req *req)
ssize_t sz, sz1;
l = WS_ReserveAll(req->ws);
- if (l < 10) {
- WS_Release(req->ws, 0);
+ if (l < 10)
return (-1);
- }
AN(VSB_new(resp, req->ws->f, l, VSB_FIXEDLEN));
More information about the varnish-commit
mailing list