MINOR: session: Take care to decrement idle_conns counter in session_unown_conn
So conn_free() only calls session_unown_conn() if necessary. The details are now
fully handled by session_unown_conn().
diff --git a/include/haproxy/connection.h b/include/haproxy/connection.h
index 8ccb31d..094e54c 100644
--- a/include/haproxy/connection.h
+++ b/include/haproxy/connection.h
@@ -463,10 +463,7 @@
{
/* Remove ourself from the session's connections list, if any. */
if (!LIST_ISEMPTY(&conn->session_list)) {
- struct session *sess = conn->owner;
- if (conn->flags & CO_FL_SESS_IDLE)
- sess->idle_conns--;
- session_unown_conn(sess, conn);
+ session_unown_conn(conn->owner, conn);
}
sockaddr_free(&conn->src);
diff --git a/include/haproxy/session.h b/include/haproxy/session.h
index 5a46c4f..05c56f6 100644
--- a/include/haproxy/session.h
+++ b/include/haproxy/session.h
@@ -77,6 +77,9 @@
static inline void session_unown_conn(struct session *sess, struct connection *conn)
{
struct sess_srv_list *srv_list = NULL;
+
+ if (conn->flags & CO_FL_SESS_IDLE)
+ sess->idle_conns--;
LIST_DEL(&conn->session_list);
LIST_INIT(&conn->session_list);
list_for_each_entry(srv_list, &sess->srv_list, srv_list) {