]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
MINOR: stream-interface: no need to call fd_stop_both() on error
authorWilly Tarreau <w@1wt.eu>
Tue, 21 Jan 2014 09:30:08 +0000 (10:30 +0100)
committerWilly Tarreau <w@1wt.eu>
Sat, 25 Jan 2014 23:42:31 +0000 (00:42 +0100)
We don't need to call fd_stop_both() since we already call
conn_cond_update_polling() which will do it. This call was introduced by
commit d29a066 ("BUG/MAJOR: connection: always recompute polling status
upon I/O").

src/stream_interface.c

index bb5b962b60875d8729581543cde9b628d3d5b7d2..c4d271542d0b82daa3a30e2492be3317490fe33e 100644 (file)
@@ -988,9 +988,8 @@ static void stream_int_chk_snd_conn(struct stream_interface *si)
 
        if (!(conn->flags & (CO_FL_HANDSHAKE|CO_FL_WAIT_L4_CONN|CO_FL_WAIT_L6_CONN))) {
                si_conn_send(conn);
-               if (conn_ctrl_ready(conn) && (conn->flags & CO_FL_ERROR)) {
+               if (conn->flags & CO_FL_ERROR) {
                        /* Write error on the file descriptor */
-                       fd_stop_both(conn->t.sock.fd);
                        __conn_data_stop_both(conn);
                        si->flags |= SI_FL_ERR;
                        goto out_wakeup;