mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-25 15:51:24 +02:00
Code Issues Projects Releases Wiki Activity

[BUG] stream_sock: fix handling for server side PROXY protocol

Browse Source 
Patch 5ab04ec47c9946a2bbc535687c023215ca813da0 was incomplete,
because if the first send() fails on an empty buffer, we fail
to rearm the polling and we can't establish the connection
anymore.

The issue was reported by Ben Timby who provided large amounts
of traces of various tests helping to reliably reproduce the issue.
This commit is contained in:
Willy Tarreau 2011-03-28 23:17:54 +02:00
parent 24bb5f504b
commit 68f49da972
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/stream_sock.c
View File

@ -751,6 +751,8 @@ int stream_sock_write(int fd)
retval = stream_sock_write_loop(si, b); retval = stream_sock_write_loop(si, b);
if (retval < 0) if (retval < 0)
goto out_error; goto out_error;
else if (retval == 0 && si->send_proxy_ofs)
goto out_may_wakeup; /* we failed to send the PROXY string */
} }
else { else {
/* may be we have received a connection acknowledgement in TCP mode without data */ /* may be we have received a connection acknowledgement in TCP mode without data */
@ -1112,6 +1114,8 @@ void stream_sock_chk_snd(struct stream_interface *si)
si->flags |= SI_FL_ERR; si->flags |= SI_FL_ERR;
goto out_wakeup; goto out_wakeup;
} }
else if (retval == 0 && si->send_proxy_ofs)
goto out_may_wakeup; /* we failed to send the PROXY string */
/* OK, so now we know that retval >= 0 means that some data might have /* OK, so now we know that retval >= 0 means that some data might have
* been sent, and that we may have to poll first. We have to do that * been sent, and that we may have to poll first. We have to do that
@ -1144,6 +1148,7 @@ void stream_sock_chk_snd(struct stream_interface *si)
ob->wex = tick_add_ifset(now_ms, ob->wto); ob->wex = tick_add_ifset(now_ms, ob->wto);
} }
out_may_wakeup:
if (likely(ob->flags & BF_WRITE_ACTIVITY)) { if (likely(ob->flags & BF_WRITE_ACTIVITY)) {
/* update timeout if we have written something */ /* update timeout if we have written something */
if ((ob->flags & (BF_OUT_EMPTY|BF_SHUTW|BF_WRITE_PARTIAL)) == BF_WRITE_PARTIAL) if ((ob->flags & (BF_OUT_EMPTY|BF_SHUTW|BF_WRITE_PARTIAL)) == BF_WRITE_PARTIAL)