RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-04-11 03:31:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MINOR] stream_sock: don't set SI_FL_WAIT_DATA if BF_SHUTW_NOW is set

Browse Source 
Don't ask for more data when we know we're about to close. This is
harmless but better have it cleaned up.
This commit is contained in:
Willy Tarreau 2009-09-20 11:13:40 +02:00
parent f41ffdc1e9
commit 59454bfaa4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/stream_sock.c
View File

@ -745,7 +745,7 @@ int stream_sock_write(int fd)
goto out_wakeup;
}
if ((b->flags & (BF_SHUTW|BF_FULL|BF_HIJACK)) == 0)
if ((b->flags & (BF_SHUTW|BF_SHUTW_NOW|BF_FULL|BF_HIJACK)) == 0)
si->flags |= SI_FL_WAIT_DATA;
EV_FD_CLR(fd, DIR_WR);
@ -924,7 +924,7 @@ void stream_sock_data_finish(struct stream_interface *si)
/* Write not closed, update FD status and timeout for writes */
if (ob->flags & BF_OUT_EMPTY) {
/* stop writing */
if ((ob->flags & (BF_FULL|BF_HIJACK)) == 0)
if ((ob->flags & (BF_FULL|BF_HIJACK|BF_SHUTW_NOW)) == 0)
si->flags |= SI_FL_WAIT_DATA;
EV_FD_COND_C(fd, DIR_WR);
ob->wex = TICK_ETERNITY;
@ -1045,7 +1045,7 @@ void stream_sock_chk_snd(struct stream_interface *si)
goto out_wakeup;
}
if ((ob->flags & (BF_SHUTW|BF_FULL|BF_HIJACK)) == 0)
if ((ob->flags & (BF_SHUTW|BF_SHUTW_NOW|BF_FULL|BF_HIJACK)) == 0)
si->flags |= SI_FL_WAIT_DATA;
ob->wex = TICK_ETERNITY;
}