mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-24 23:31:40 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MEDIUM: stconn: also consider SE_FL_EOI to switch to SE_FL_ERROR

Browse Source 
In se_fl_set_error() we used to switch to SE_FL_ERROR only when there
is already SE_FL_EOS indicating that the read side is closed. But that
is not sufficient, we need to consider all cases where no more reads
will be performed on the connection, and as such also include SE_FL_EOI.

Without this, some aborted connections during a transfer sometimes only
stop after the timeout, because the ERR_PENDING is never promoted to
ERROR.

This must be backported to 2.7 and requires previous patch "CLEANUP:
stconn: always use se_fl_set_error() to set the pending error".
This commit is contained in:
Willy Tarreau 2023-01-17 16:27:35 +01:00
parent 35c4dd0005
commit e77f4306ba
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/haproxy/stconn.h
View File

@ -99,7 +99,7 @@ static forceinline uint se_fl_get(const struct sedesc *se)
/* sets SE_FL_ERROR or SE_FL_ERR_PENDING on the endpoint */
static inline void se_fl_set_error(struct sedesc *se)
{
if (se_fl_test(se, SE_FL_EOS))
if (se_fl_test(se, (SE_FL_EOS|SE_FL_EOI)))
se_fl_set(se, SE_FL_ERROR);
else
se_fl_set(se, SE_FL_ERR_PENDING);