RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-23 21:22:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MEDIUM: connections: Remove error flags when retrying.

Browse Source 
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.
This commit is contained in:
Olivier Houchard 2018-12-08 19:08:48 +01:00 committed by Willy Tarreau
parent 425f17a6af
commit ac1ce6f9b8
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/backend.c
View File

@ -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) {