From ac1ce6f9b80dd788bfe0e4d94b4d61cf1c15e563 Mon Sep 17 00:00:00 2001 From: Olivier Houchard Date: Sat, 8 Dec 2018 19:08:48 +0100 Subject: [PATCH] BUG/MEDIUM: connections: Remove error flags when retrying. In connect_server(), when retrying to connect, remove the error flags from the connection and the conn_stream, we're trying to connect again, anyway. --- src/backend.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/backend.c b/src/backend.c index 46e59eac5..24fcb7247 100644 --- a/src/backend.c +++ b/src/backend.c @@ -1130,9 +1130,11 @@ int connect_server(struct stream *s) srv_cs = objt_cs(s->si[1].end); if (srv_cs) { old_conn = srv_conn = cs_conn(srv_cs); - if (old_conn && - !(old_conn->flags & (CO_FL_ERROR | CO_FL_WAIT_L4_CONN))) + if (old_conn) { + old_conn->flags &= ~(CO_FL_ERROR | CO_FL_SOCK_RD_SH | CO_FL_SOCK_WR_SH); + srv_cs->flags &= ~CS_FL_ERROR; reuse = 1; + } } else { for (i = 0; i < MAX_SRV_LIST; i++) { if (s->sess->srv_list[i].target == s->target) {