RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-03-01 17:10:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MEDIUM: stream_interface: Don't report read0 if we were not connected.

Browse Source 
In si_cs_recv(), report that arrive at the end of stream only if we were
indeed connected, we don't want that if the connection failed and we're about
to retry.
This commit is contained in:
Olivier Houchard 2018-12-13 15:38:16 +01:00 committed by Willy Tarreau
parent ab8b075ff0
commit fd0c2dcf00
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/stream_interface.c
View File

@ -1340,11 +1340,13 @@ int si_cs_recv(struct conn_stream *cs)
return (cur_read != 0) || si_rx_blocked(si);
out_shutdown_r:
/* we received a shutdown */
ic->flags |= CF_READ_NULL;
if (ic->flags & CF_AUTO_CLOSE)
channel_shutw_now(ic);
stream_sock_read0(si);
if (conn->flags & CO_FL_CONNECTED) {
/* we received a shutdown */
ic->flags |= CF_READ_NULL;
if (ic->flags & CF_AUTO_CLOSE)
channel_shutw_now(ic);
stream_sock_read0(si);
}
return 1;
}