RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-14 15:34:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MINOR] stream_sock: always clear BF_EXPECT_MORE upon complete transfer

Browse Source 
When sending is complete, it's preferred to systematically clear the flags
that were set for that transfer. What could happen is that the to_forward
counter had caused the MSG_MORE flag to be set and BF_EXPECT_MORE not to
be cleared, resulting in this flag being unexpectedly maintained for next
round.

The code has taken extreme care of not doing this till now, but it's not
acceptable that the caller has to know these precise semantics. So let's
unconditionnally clear the flag instead.

For the sake of safety, this fix should be backported to 1.4.
This commit is contained in:
Willy Tarreau 2011-05-11 20:14:03 +02:00
parent 5c62092ca1
commit 8f8b492295
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/stream_sock.c
View File

@ -650,8 +650,6 @@ static int stream_sock_write_loop(struct stream_interface *si, struct buffer *b)
send_flag |= MSG_MORE;
}
else if (b->flags & BF_EXPECT_MORE) {
/* it was forced on the buffer, this flag is one-shoot */
b->flags &= ~BF_EXPECT_MORE;
send_flag |= MSG_MORE;
}
@ -661,9 +659,9 @@ static int stream_sock_write_loop(struct stream_interface *si, struct buffer *b)
ret = send(si->fd, b->w, max, send_flag);
/* disable it only once everything has been sent */
if (ret == max && (b->flags & BF_SEND_DONTWAIT))
b->flags &= ~BF_SEND_DONTWAIT;
/* Always clear both flags once everything has been sent */
if (ret == max)
b->flags &= ~(BF_EXPECT_MORE | BF_SEND_DONTWAIT);
} else {
int skerr;
socklen_t lskerr = sizeof(skerr);