mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-06 15:17:01 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MEDIUM: mux-spop; Don't report a read error if there are pending data

Browse Source 
When an read error is detected, no error must be reported on the SPOP
connection is there are still some data to parse. It is important to be sure
to process all data before reporting the error and be sure to not truncate
received frames. However, we must also take care to handle short read case
to not wait data that will never be received.

This patch must be backported to 3.1.
This commit is contained in:
Christopher Faulet 2025-05-14 09:33:46 +02:00
parent 16314bb93c
commit 6e46f0bf93
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/mux_spop.c
View File

@ -2381,7 +2381,8 @@ static int spop_recv(struct spop_conn *spop_conn)
TRACE_DATA("received read0", SPOP_EV_SPOP_CONN_RECV, conn);
spop_conn->flags |= SPOP_CF_RCVD_SHUT;
}
if (conn->flags & CO_FL_ERROR) {
if ((conn->flags & CO_FL_ERROR) &&
(!b_data(&spop_conn->dbuf) || (spop_conn->flags & SPOP_CF_DEM_SHORT_READ))) {
TRACE_DATA("connection error", SPOP_EV_SPOP_CONN_RECV, conn);
spop_conn->flags |= SPOP_CF_ERROR;
}