mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-01-20 17:41:06 +01:00
Code Issues Projects Releases Wiki Activity

CLEANUP: stream: Remove bogus loop in conn_si_send_proxy

Browse Source 
The if-statement was converted into a while-loop in
7fe45698f58a53dda9182a5970a2ea4bda9f92fe to handle EINTR.

This special handling was later replaced in
0a03c0f022faf2773995fc8b9d14256c8a306e5a by conn_sock_send.

The while-loop was not changed back and is not unconditionally
exited after one iteration, with no `continue` inside the body.

Replace by an if-statement.
This commit is contained in:
Tim Duesterhus 2019-02-26 17:09:51 +01:00 committed by Willy Tarreau
parent c7f880ee3b
commit 36839dc39f
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/stream_interface.c
View File

@ -339,7 +339,7 @@ int conn_si_send_proxy(struct connection *conn, unsigned int flag)
* connection, in which case the connection is validated only once
* we've sent the whole proxy line. Otherwise we use connect().
*/
while (conn->send_proxy_ofs) {
if (conn->send_proxy_ofs) {
const struct conn_stream *cs;
int ret;
@ -399,7 +399,6 @@ int conn_si_send_proxy(struct connection *conn, unsigned int flag)
goto out_wait;
/* OK we've sent the whole line, we're connected */
break;
}
/* The connection is ready now, simply return and let the connection