upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-03-26 20:33:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

BUG/MEDIUM: connections: Remove subscription if going in idle mode.

Browse source 
Make sure we don't have any subscription when the connection is going in
idle mode, otherwise there's a race condition when the connection is
reused, if there are still old subscriptions, new ones won't be done.

No backport is needed.
This commit is contained in:
Olivier Houchard 2018-10-21 00:32:01 +02:00 committed by Willy Tarreau
parent 52b946686c
commit 1fddc9b7bb
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
include/proto/connection.h
View file

@ -701,13 +701,23 @@ static inline struct conn_stream *cs_new(struct connection *conn)
return cs;
}
static inline void conn_force_unsubscribe(struct connection *conn)
{
if (conn->recv_wait) {
conn->recv_wait->wait_reason &= ~SUB_CAN_RECV;
conn->recv_wait = NULL;
}
if (conn->send_wait) {
conn->send_wait->wait_reason &= ~SUB_CAN_SEND;
conn->send_wait = NULL;
}
}
/* Releases a connection previously allocated by conn_new() */
static inline void conn_free(struct connection *conn)
{
if (conn->recv_wait)
conn->recv_wait->wait_reason &= ~SUB_CAN_RECV;
if (conn->send_wait)
conn->send_wait->wait_reason &= ~SUB_CAN_SEND;
conn_force_unsubscribe(conn);
pool_free(pool_head_connection, conn);
}

1
include/proto/stream_interface.h
View file

@ -194,6 +194,7 @@ static inline void si_idle_cs(struct stream_interface *si, struct list *pool)
struct conn_stream *cs = __objt_cs(si->end);
struct connection *conn = cs->conn;
conn_force_unsubscribe(conn);
if (pool)
LIST_ADD(pool, &conn->list);