RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-04-04 23:29:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: stream-int: always report received shutdowns

Browse Source 
As mentioned in c192b0ab95 ("MEDIUM: connection: remove CO_FL_CONNECTED
and only rely on CO_FL_WAIT_*"), si_cs_recv() currently does not propagate
CS_FL_EOS to CF_READ_NULL if CO_FL_WAIT_L4L6 is set, while this situation
doesn't exist anymore. Let's get rid of this confusing test.
This commit is contained in:
Willy Tarreau 2020-01-23 16:32:24 +01:00
parent 220a26c316
commit 18955db43d
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/stream_interface.c
View File

@ -1499,14 +1499,11 @@ int si_cs_recv(struct conn_stream *cs)
ret = 1; ret = 1;
} }
else if (cs->flags & CS_FL_EOS) { else if (cs->flags & CS_FL_EOS) {
/* connection closed */ /* we received a shutdown */
if (!(conn->flags & CO_FL_WAIT_L4L6)) { ic->flags |= CF_READ_NULL;
/* we received a shutdown */ if (ic->flags & CF_AUTO_CLOSE)
ic->flags |= CF_READ_NULL; channel_shutw_now(ic);
if (ic->flags & CF_AUTO_CLOSE) stream_int_read0(si);
channel_shutw_now(ic);
stream_int_read0(si);
}
ret = 1; ret = 1;
} }
else if (!si_rx_blocked(si)) { else if (!si_rx_blocked(si)) {