CLEANUP: stream-int: remove a redundant clearing of the linger_risk flag

In stream_sock_read0(), we used to clear this flag. But the only case
where stream_sock_read0() is called is in reaction with a conn_sock_read0()
event coming from the lower layers, which already clears this flag. So let's
remove this duplicate one and clear one of the few remaining layering
violations in this area.
This commit is contained in:
Willy Tarreau 2015-03-12 22:32:27 +01:00
parent 8747b6dbc8
commit 1140512f76
1 changed files with 1 additions and 5 deletions

View File

@ -1343,9 +1343,7 @@ static void si_conn_send_cb(struct connection *conn)
/*
* This function propagates a null read received on a socket-based connection.
* It updates the stream interface. If the stream interface has SI_FL_NOHALF,
* the close is also forwarded to the write side as an abort. This function is
* still socket-specific as it handles a setsockopt() call to set the SO_LINGER
* state on the socket.
* the close is also forwarded to the write side as an abort.
*/
void stream_sock_read0(struct stream_interface *si)
{
@ -1375,8 +1373,6 @@ void stream_sock_read0(struct stream_interface *si)
}
/* otherwise that's just a normal read shutdown */
if (conn_ctrl_ready(conn))
fdtab[conn->t.sock.fd].linger_risk = 0;
__conn_data_stop_recv(conn);
return;