From: Willy Tarreau <w@1wt.eu>
Date: Fri, 12 Oct 2012 15:36:40 +0000 (+0200)
Subject: BUG/MINOR: session: fix some leftover from debug code
X-Git-Tag: v1.5-dev13~158
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e9909f4e50522732624aa3dd5e7d29901e10d98b;p=thirdparty%2Fhaproxy.git

BUG/MINOR: session: fix some leftover from debug code

Commit 82569f91 moved the health and monitor-net checks to session.c
but a debug test introduced 0& to disable MSG_DONTWAIT in the recv()
call and this debug code remained there. Since the socket is marked
non-blocking, there should be no effect but it's dangerous to keep
such a thing here.
---

diff --git a/src/session.c b/src/session.c
index 3fcce844a0..1d5514e3d5 100644
--- a/src/session.c
+++ b/src/session.c
@@ -151,7 +151,7 @@ int session_accept(struct listener *l, int cfd, struct sockaddr_storage *addr)
 		 *  - HEALTH mode without HTTP check => just send "OK"
 		 *  - TCP mode from monitoring address => just close
 		 */
-		recv(cfd, trash, trashlen, 0&MSG_DONTWAIT);
+		recv(cfd, trash, trashlen, MSG_DONTWAIT);
 		if (p->mode == PR_MODE_HTTP ||
 		    (p->mode == PR_MODE_HEALTH && (p->options2 & PR_O2_CHK_ANY) == PR_O2_HTTP_CHK))
 			send(cfd, "HTTP/1.0 200 OK\r\n\r\n", 19, MSG_DONTWAIT|MSG_NOSIGNAL|MSG_MORE);