Skip to content

V
varnish-cache
Commit 7ce5f508 authored by Dridi Boukelmoune's avatar Dridi Boukelmoune Committed by Simon Stridsberg
Browse files
Options

http2_send: Collect the timeout error

parent 884f8b31
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 10 deletions
bin/varnishd/http2/cache_http2_send.c
View file @ 7ce5f508
...@@ -48,6 +48,7 @@ h2_cond_wait(pthread_cond_t *cond, struct h2_sess *h2, struct h2_req *r2) ...@@ -48,6 +48,7 @@ h2_cond_wait(pthread_cond_t *cond, struct h2_sess *h2, struct h2_req *r2)
{ {
vtim_dur tmo = 0.; vtim_dur tmo = 0.;
vtim_real now; vtim_real now;
h2_error h2e;
int r; int r;
AN(cond); AN(cond);
...@@ -72,18 +73,16 @@ h2_cond_wait(pthread_cond_t *cond, struct h2_sess *h2, struct h2_req *r2) ...@@ -72,18 +73,16 @@ h2_cond_wait(pthread_cond_t *cond, struct h2_sess *h2, struct h2_req *r2)
* that the stream reached the idle_send_timeout via the lock and * that the stream reached the idle_send_timeout via the lock and
* force it to log it. * force it to log it.
*/ */
if (h2_stream_tmo(h2, r2, now)) h2e = h2_stream_tmo(h2, r2, now);
r = ETIMEDOUT; if (h2e == NULL && r == ETIMEDOUT) {
else if (r == ETIMEDOUT) h2e = h2_stream_tmo(h2, r2, NAN);
AN(h2_stream_tmo(h2, r2, NAN)); AN(h2e);
if (r == ETIMEDOUT) {
if (r2->error == NULL)
r2->error = H2SE_CANCEL;
return (-1);
} }
return (0); if (r2->error == NULL)
r2->error = h2e;
return (h2e != NULL ? -1 : 0);
} }
static void static void
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment