mirror of
http://git.haproxy.org/git/haproxy.git
synced 2026-02-05 12:03:26 +02:00
MINOR: mux-spop: Set SPOP_CF_ERROR flag on connection error only
The SPOP_CF_ERROR flag is now set on connection error only. It was also set on some demux failures. But it is not mandatory because the connection is closed anyway. And it is handy to have a flag dedicated to tcp connection error. It was the original purpose of this flag. This patch could be backported to 3.1 to ease future backports.
This commit is contained in:
@@ -1726,7 +1726,6 @@ static int spop_conn_handle_hello(struct spop_conn *spop_conn)
|
||||
return 1;
|
||||
fail:
|
||||
spop_conn->state = SPOP_CS_CLOSED;
|
||||
spop_conn->flags |= SPOP_CF_ERROR;
|
||||
TRACE_STATE("switching to CLOSED", SPOP_EV_RX_FRAME|SPOP_EV_RX_HELLO, spop_conn->conn);
|
||||
TRACE_DEVEL("leaving on error", SPOP_EV_RX_FRAME|SPOP_EV_RX_HELLO|SPOP_EV_SPOP_CONN_ERR, spop_conn->conn);
|
||||
return 0;
|
||||
@@ -1839,7 +1838,6 @@ static int spop_conn_handle_disconnect(struct spop_conn *spop_conn)
|
||||
return 1;
|
||||
fail:
|
||||
spop_conn->state = SPOP_CS_CLOSED;
|
||||
spop_conn->flags |= SPOP_CF_ERROR;
|
||||
TRACE_STATE("switching to CLOSED", SPOP_EV_RX_FRAME|SPOP_EV_RX_DISCO, spop_conn->conn);
|
||||
TRACE_DEVEL("leaving on error", SPOP_EV_RX_FRAME|SPOP_EV_RX_DISCO|SPOP_EV_SPOP_CONN_ERR, spop_conn->conn);
|
||||
return 0;
|
||||
|
||||
Reference in New Issue
Block a user