upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-04-27 00:57:03 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

MEDIUM: stream-int: support splicing from applets

Browse source 
If we want to splice from applets, we must check the pipe before clearing
SI_FL_WAIT_ROOM.
This commit is contained in:
Willy Tarreau 2014-12-09 19:47:54 +01:00
parent b034b2598d
commit 9b20c55562
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/stream_interface.c
View file

@ -183,7 +183,7 @@ static void stream_int_update_embedded(struct stream_interface *si)
(si->ib->cons->flags & SI_FL_WAIT_DATA)) {
si_chk_snd(si->ib->cons);
/* check if the consumer has freed some space */
if (!channel_full(si->ib))
if (!channel_full(si->ib) && !si->ib->pipe)
si->flags &= ~SI_FL_WAIT_ROOM;
}
@ -314,7 +314,7 @@ static void stream_int_chk_rcv(struct stream_interface *si)
if (unlikely(si->state != SI_ST_EST || (ib->flags & (CF_SHUTR|CF_DONT_READ))))
return;
if (channel_full(ib)) {
if (channel_full(ib) || ib->pipe) {
/* stop reading */
si->flags |= SI_FL_WAIT_ROOM;
}