Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
varnish-cache
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
varnishcache
varnish-cache
Commits
5ffa8a76
Commit
5ffa8a76
authored
Nov 16, 2023
by
Dridi Boukelmoune
Committed by
Simon Stridsberg
Mar 18, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
http2_send: Collect the timeout error
Conflicts: bin/varnishd/http2/cache_http2_send.c
parent
e006849e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
10 deletions
+9
-10
cache_http2_send.c
bin/varnishd/http2/cache_http2_send.c
+9
-10
No files found.
bin/varnishd/http2/cache_http2_send.c
View file @
5ffa8a76
...
...
@@ -46,6 +46,7 @@ static int
h2_cond_wait
(
pthread_cond_t
*
cond
,
struct
h2_sess
*
h2
,
struct
h2_req
*
r2
)
{
vtim_real
now
,
when
=
0
.;
h2_error
h2e
;
int
r
;
AN
(
cond
);
...
...
@@ -70,18 +71,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
* force it to log it.
*/
if
(
h2_stream_tmo
(
h2
,
r2
,
now
))
r
=
ETIMEDOUT
;
else
if
(
r
==
ETIMEDOUT
)
AN
(
h2_stream_tmo
(
h2
,
r2
,
NAN
));
if
(
r
==
ETIMEDOUT
)
{
if
(
r2
->
error
==
NULL
)
r2
->
error
=
H2SE_CANCEL
;
return
(
-
1
);
h2e
=
h2_stream_tmo
(
h2
,
r2
,
now
);
if
(
h2e
==
NULL
&&
r
==
ETIMEDOUT
)
{
h2e
=
h2_stream_tmo
(
h2
,
r2
,
NAN
);
AN
(
h2e
);
}
return
(
0
);
if
(
r2
->
error
==
NULL
)
r2
->
error
=
h2e
;
return
(
h2e
!=
NULL
?
-
1
:
0
);
}
static
void
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment