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

MINOR: tcp/uxst/sockpair: only ask for I/O when really waiting for a connect()

Browse Source 
Now that the stream-interface properly handles synchonous connects, there
is no more reason for subscribing and doing nothing.
This commit is contained in:
Willy Tarreau 2020-03-04 16:38:00 +01:00
parent ada4c5806b
commit 4c69cff438
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/proto_sockpair.c
View File

@ -332,7 +332,6 @@ static int sockpair_connect_server(struct connection *conn, int flags)
return SF_ERR_RESOURCE;
}
fd_want_send(fd); /* for connect status, proxy protocol or SSL */
return SF_ERR_NONE; /* connection is OK */
}

7
src/proto_tcp.c
View File

@ -576,8 +576,10 @@ int tcp_connect_server(struct connection *conn, int flags)
conn_ctrl_init(conn); /* registers the FD */
fdtab[fd].linger_risk = 1; /* close hard if needed */
if (conn->flags & CO_FL_WAIT_L4_CONN)
fd_cant_recv(fd); // we'll change this once the connection is validated
if (conn->flags & CO_FL_WAIT_L4_CONN) {
fd_want_send(fd);
fd_cant_send(fd);
}
if (conn_xprt_init(conn) < 0) {
conn_full_close(conn);
@ -585,7 +587,6 @@ int tcp_connect_server(struct connection *conn, int flags)
return SF_ERR_RESOURCE;
}
fd_want_send(fd); /* for connect status, proxy protocol or SSL */
return SF_ERR_NONE; /* connection is OK */
}

7
src/proto_uxst.c
View File

@ -578,8 +578,10 @@ static int uxst_connect_server(struct connection *conn, int flags)
conn_ctrl_init(conn); /* registers the FD */
fdtab[fd].linger_risk = 0; /* no need to disable lingering */
if (conn->flags & CO_FL_WAIT_L4_CONN)
fd_cant_recv(fd); // we'll change this once the connection is validated
if (conn->flags & CO_FL_WAIT_L4_CONN) {
fd_want_send(fd);
fd_cant_send(fd);
}
if (conn_xprt_init(conn) < 0) {
conn_full_close(conn);
@ -587,7 +589,6 @@ static int uxst_connect_server(struct connection *conn, int flags)
return SF_ERR_RESOURCE;
}
fd_want_send(fd); /* for connect status, proxy protocol or SSL */
return SF_ERR_NONE; /* connection is OK */
}