upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-07-13 11:09:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

BUG/MEDIUM: mux-fcgi: Truly drain outgoing HTX data when the stream is closed

Browse source 
When we try to send data to the server and the stream is closed (in error,
in half-closed state or fully closed), remaining data must be drained. This
way the upper stream is able to properly handle the stream close.

However, there was a bug here. The mux claimed to have consumed these data
without draining them from the buffer. So the upper stream will try to send
these data in loop. Because of this bug, it is possible to trigger the
watchdog with a bogus stream.

This patch should fix the issue #3425. It must be backported to all
supported versions.
This commit is contained in:
Christopher Faulet 2026-06-24 16:35:54 +02:00
parent 6c69d6b2b1
commit 7668409cf2
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/mux_fcgi.c
View file

@ -4242,11 +4242,14 @@ static size_t fcgi_snd_buf(struct stconn *sc, struct buffer *buf, size_t count,
done:
if (fstrm->state >= FCGI_SS_HLOC) {
struct htx_ret htxret;
/* trim any possibly pending data after we close (extra CR-LF,
* unprocessed trailers, abnormal extra data, ...)
*/
total += count;
count = 0;
htxret = htx_drain(htx, count);
total += htxret.ret;
count -= htxret.ret;
}
if (fstrm->state == FCGI_SS_ERROR) {