[master] c72674662 fix between bytes timeout vs total timeout

[Nils Goroll]

On 21/02/2019 18:13, Dridi Boukelmoune wrote:
> Does this mean the client side total timeout applies to bgfetch too?

No, that's the NAN argument here:

diff --git a/bin/varnishd/http1/cache_http1_fetch.c
b/bin/varnishd/http1/cache_http1_fetch.c
index fa456a408..f4ee4ebf0 100644
--- a/bin/varnishd/http1/cache_http1_fetch.c
+++ b/bin/varnishd/http1/cache_http1_fetch.c
@@ -178,7 +178,7 @@ V1F_FetchRespHdr(struct busyobj *bo)

        t = VTIM_real() + htc->first_byte_timeout;
        hs = HTC_RxStuff(htc, HTTP1_Complete, NULL, NULL,
-           t, t + htc->between_bytes_timeout, cache_param->http_resp_size);
+           t, NAN, htc->between_bytes_timeout, cache_param->http_resp_size);
        if (hs != HTC_S_COMPLETE) {
                bo->acct.beresp_hdrbytes +=
                    htc->rxbuf_e - htc->rxbuf_b;

-- 

** * * UPLEX - Nils Goroll Systemoptimierung

Scheffelstraße 32
22301 Hamburg

tel +49 40 28805731
mob +49 170 2723133
fax +49 40 42949753

xmpp://slink@jabber.int.uplex.de/

http://uplex.de/

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <https://www.varnish-cache.org/lists/pipermail/varnish-commit/attachments/20190221/0199b0aa/attachment-0001.bin>