mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-11-24 12:20:59 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Willy Tarreau 2012-10-12 17:36:40 +02:00
parent 6c03a64978
commit e9909f4e50
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/session.c
View File

@ -151,7 +151,7 @@ int session_accept(struct listener *l, int cfd, struct sockaddr_storage *addr)
* - HEALTH mode without HTTP check => just send "OK" * - HEALTH mode without HTTP check => just send "OK"
* - TCP mode from monitoring address => just close * - 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 || if (p->mode == PR_MODE_HTTP ||
(p->mode == PR_MODE_HEALTH && (p->options2 & PR_O2_CHK_ANY) == PR_O2_HTTP_CHK)) (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); send(cfd, "HTTP/1.0 200 OK\r\n\r\n", 19, MSG_DONTWAIT|MSG_NOSIGNAL|MSG_MORE);