MINOR: stream-int: use conn_sock_shutw() to shutdown a connection

Stop calling shutdown() on the connection's fd. Note, this also seems
to fix a bug which was harmless, but which consisted in not marking
the connection as shutdown at the socket level until the other side
was shut as well.
This commit is contained in:
Willy Tarreau 2015-03-12 22:44:53 +01:00
parent a02e8c9510
commit 4dfd54f26a

View File

@ -903,8 +903,7 @@ static void stream_int_shutw_conn(struct stream_interface *si)
*/
if (!(si->flags & SI_FL_NOHALF) || !(ic->flags & (CF_SHUTR|CF_DONT_READ))) {
/* We shutdown transport layer */
if (conn_ctrl_ready(conn))
shutdown(conn->t.sock.fd, SHUT_WR);
conn_sock_shutw(conn);
if (!(ic->flags & (CF_SHUTR|CF_DONT_READ))) {
/* OK just a shutw, but we want the caller