mirror of
http://git.haproxy.org/git/haproxy.git/
synced 2025-02-20 20:57:00 +00:00
BUG/MAJOR: mux-fcgi: Stop sending loop if FCGI stream is blocked for any reason
Because of a typo error in conditions to exit the sending loop, it is possible to loop infinitely in fcgi_snd_buf() function. Instead of checking the FCGI stream is not blocked to continue sending data, the FCGI connection is used. So it is possible to have a stream blocked because there is not enough space in the mux buffers to copy more data but continue to loop to send more data. This patch should fix the issue #637. It must be backported to 2.1.
This commit is contained in:
parent
2bdcc70fa7
commit
fe410d685a
@ -3931,7 +3931,7 @@ static size_t fcgi_snd_buf(struct conn_stream *cs, struct buffer *buf, size_t co
|
||||
if (!(fstrm->flags & FCGI_SF_OUTGOING_DATA) && count)
|
||||
fstrm->flags |= FCGI_SF_OUTGOING_DATA;
|
||||
|
||||
while (fstrm->state < FCGI_SS_HLOC && !(fconn->flags & FCGI_SF_BLK_ANY) &&
|
||||
while (fstrm->state < FCGI_SS_HLOC && !(fstrm->flags & FCGI_SF_BLK_ANY) &&
|
||||
count && !htx_is_empty(htx)) {
|
||||
blk = htx_get_head_blk(htx);
|
||||
ALREADY_CHECKED(blk);
|
||||
|
Loading…
Reference in New Issue
Block a user