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

BUG/MINOR: stream_sock: don't remove BF_EXPECT_MORE and BF_SEND_DONTWAIT on partial writes

Browse Source 
The flags are one-shot but should be maintained over all send() operations
as long as send_max is not flushed. The flags were incidentely cleared once
a complete send() was performed, regardless of the fact that the send()
might have been on the first half of a buffer before a wrapping. The result
is that on wrapping data (eg: which happens often with chunked encoding),
many incomplete segments are transmitted instead of being aggregated.

The fix consists in only flushing the flags only once send_max is empty,
which was the expected behaviour.

This fix should be backported to 1.4 though it is not critical, just sub-optimal.
This commit is contained in:
Willy Tarreau 2012-03-09 18:10:44 +01:00
parent 4544678490
commit f17810e4fa
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/stream_sock.c
View File

@ -633,10 +633,6 @@ static int stream_sock_write_loop(struct stream_interface *si, struct buffer *b)
send_flag &= ~MSG_MORE;
ret = send(si->fd, b->w, max, send_flag);
/* 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);
@ -668,6 +664,8 @@ static int stream_sock_write_loop(struct stream_interface *si, struct buffer *b)
b->send_max -= ret;
if (!b->send_max) {
/* Always clear both flags once everything has been sent, they're one-shot */
b->flags &= ~(BF_EXPECT_MORE | BF_SEND_DONTWAIT);
if (likely(!b->pipe))
b->flags |= BF_OUT_EMPTY;
break;