From: Willy Tarreau Date: Tue, 4 Feb 2014 23:18:47 +0000 (+0100) Subject: MINOR: session: clean up the connection free code X-Git-Tag: v1.5-dev23~178 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a23ee3a2ea12bcb8244304d308b9f3fe69169fd8;p=thirdparty%2Fhaproxy.git MINOR: session: clean up the connection free code Use conn_free() instead of pool_free2(conn...). This makes the code more auditable. --- diff --git a/src/session.c b/src/session.c index aae0c69f8f..0a03677856 100644 --- a/src/session.c +++ b/src/session.c @@ -314,6 +314,7 @@ static void kill_mini_session(struct session *s) /* kill the connection now */ conn_force_close(conn); + conn_free(conn); s->fe->feconn--; session_store_counters(s); @@ -335,8 +336,6 @@ static void kill_mini_session(struct session *s) task_delete(s->task); task_free(s->task); - - pool_free2(pool2_connection, conn); pool_free2(pool2_session, s); }