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

BUG/MEDIUM: fix broken send_proxy on FreeBSD

Browse Source 
David Berard reported that send-proxy was broken on FreeBSD and tracked the
issue to be an error returned by send(). We already had the same issue in
the past in another area which was addressed by the following commit :

   0ea0cf6 BUG: raw_sock: also consider ENOTCONN in addition to EAGAIN

In fact, on Linux send() returns EAGAIN when the connection is not yet
established while other OSes return ENOTCONN. Let's consider ENOTCONN for
send-proxy there as the same as EAGAIN.

David confirmed that this change properly fixed the issue.

Another place was affected as well (health checks with send-proxy), and
was fixed.

This fix does not need any backport since it only affects 1.5.
This commit is contained in:
Willy Tarreau 2013-09-03 09:02:11 +02:00
parent be55431f9f
commit 95742a43aa
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/connection.c
View File

@ -573,7 +573,7 @@ int conn_local_send_proxy(struct connection *conn, unsigned int flag)
goto out_wait;
if (ret < 0) {
if (errno == EAGAIN)
if (errno == EAGAIN || errno == ENOTCONN)
goto out_wait;
goto out_error;
}

2
src/stream_interface.c
View File

@ -468,7 +468,7 @@ int conn_si_send_proxy(struct connection *conn, unsigned int flag)
goto out_wait;
if (ret < 0) {
if (errno == EAGAIN)
if (errno == EAGAIN || errno == ENOTCONN)
goto out_wait;
goto out_error;
}