From: Willy Tarreau <w@1wt.eu>
Date: Tue, 29 Dec 2009 07:02:56 +0000 (+0100)
Subject: [MINOR] stream_sock: prepare for closing when all pending data are sent
X-Git-Tag: v1.4-dev5~33
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=33b2db69a95e224bc4360020ed0215c3e04cb020;p=thirdparty%2Fhaproxy.git

[MINOR] stream_sock: prepare for closing when all pending data are sent

Since we'll soon be able to close a connection with remaining data in a
buffer, it becomes obvious that we can prepare to close when we're about
to send the last chunk of data and not the whole buffer.
---

diff --git a/src/stream_sock.c b/src/stream_sock.c
index a733e9939c..89102adc06 100644
--- a/src/stream_sock.c
+++ b/src/stream_sock.c
@@ -612,7 +612,7 @@ static int stream_sock_write_loop(struct stream_interface *si, struct buffer *b)
 
 			if (MSG_MORE &&
 			    (((b->flags & (BF_SHUTW|BF_SHUTW_NOW|BF_HIJACK)) == BF_SHUTW_NOW &&
-			      (max == b->l)) ||
+			      (max == b->send_max)) ||
 			     (max != b->l && max != b->send_max))
 			    && (fdtab[si->fd].flags & FD_FL_TCP)) {
 				send_flag |= MSG_MORE;