kozorizki/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG/MEDIUM: connections: Don't reset the conn flags in *connect_server().

Browse Source 
In the various connect_server() functions, don't reset the connection flags,
as some may have been set before. The flags are initialized in conn_init(),
anyway.
This commit is contained in:
Olivier Houchard 2018-11-23 14:23:07 +01:00 committed by Willy Tarreau
parent f490f30ed8
commit 637b695d6a
3 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/proto_sockpair.c
View File

@ -242,8 +242,6 @@ static int sockpair_connect_server(struct connection *conn, int data, int delack
/* the FD is stored in the sockaddr struct */
dst_fd = ((struct sockaddr_in *)&conn->addr.to)->sin_addr.s_addr;
conn->flags = 0;
if (obj_type(conn->target) != OBJ_TYPE_PROXY &&
obj_type(conn->target) != OBJ_TYPE_SERVER) {
conn->flags |= CO_FL_ERROR;

2
src/proto_tcp.c
View File

@ -289,7 +289,7 @@ int tcp_connect_server(struct connection *conn, int data, int delack)
struct proxy *be;
struct conn_src *src;
conn->flags = CO_FL_WAIT_L4_CONN; /* connection in progress */
conn->flags |= CO_FL_WAIT_L4_CONN; /* connection in progress */
switch (obj_type(conn->target)) {
case OBJ_TYPE_PROXY:

2
src/proto_uxst.c
View File

@ -434,8 +434,6 @@ static int uxst_connect_server(struct connection *conn, int data, int delack)
struct server *srv;
struct proxy *be;
conn->flags = 0;
switch (obj_type(conn->target)) {
case OBJ_TYPE_PROXY:
be = objt_proxy(conn->target);