RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-29 08:02:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MINOR: stream-int: Process connection/CS errors first in si_cs_send()

Browse Source 
Errors on the connections or the conn-stream must always be processed in
si_cs_send(), even if the stream-interface is already subscribed on
sending. This patch does not fix any concrete bug per-se. But it is required by
the following one to handle those errors during synchronous sends.

This patch must be backported with the following one to 2.0 and probably to 1.9
too, but with caution because the code is really different.
This commit is contained in:
Christopher Faulet 2019-09-23 15:57:29 +02:00
parent c77c2d4f9c
commit 328ed220a8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/stream_interface.c
View File

@ -646,10 +646,6 @@ int si_cs_send(struct conn_stream *cs)
int ret;
int did_send = 0;
/* We're already waiting to be able to send, give up */
if (si->wait_event.events & SUB_RETRY_SEND)
return 0;
if (conn->flags & CO_FL_ERROR || cs->flags & (CS_FL_ERROR|CS_FL_ERR_PENDING)) {
/* We're probably there because the tasklet was woken up,
* but process_stream() ran before, detected there were an
@ -663,6 +659,10 @@ int si_cs_send(struct conn_stream *cs)
return 1;
}
/* We're already waiting to be able to send, give up */
if (si->wait_event.events & SUB_RETRY_SEND)
return 0;
/* we might have been called just after an asynchronous shutw */
if (conn->flags & CO_FL_SOCK_WR_SH || oc->flags & CF_SHUTW)
return 1;