RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-18 01:14:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MEDIUM: mux-pt: Release the tasklet during an HTTP upgrade

Browse Source 
When a TCP connection is upgraded to HTTP, the passthrough multiplexer owning
the client connection is detroyed and replaced by an HTTP multiplexer. When it
happens, the connection context is changed (it is in fact the mux itself). Thus,
when the mux-pt is destroyed, the connection is not released. But, only the
connection must be kept. Everything else concerning the mux must be
released. Especially, the tasklet used for I/O subscriptions. In this part,
there was a bug and the tasklet was never released.

This patch should fix the issue #935. It must be backported as far as 2.0.
This commit is contained in:
Christopher Faulet 2020-11-03 09:11:43 +01:00
parent 75bef00538
commit 5a7ca29061
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/mux_pt.c
View File

@ -26,23 +26,31 @@ DECLARE_STATIC_POOL(pool_head_pt_ctx, "mux_pt", sizeof(struct mux_pt_ctx));
static void mux_pt_destroy(struct mux_pt_ctx *ctx) static void mux_pt_destroy(struct mux_pt_ctx *ctx)
{ {
/* The connection must be aattached to this mux to be released */ struct connection *conn = NULL;
if (ctx && ctx->conn && ctx->conn->ctx == ctx) {
struct connection *conn = ctx->conn; if (ctx) {
/* The connection must be attached to this mux to be released */
if (ctx->conn && ctx->conn->ctx == ctx)
conn = ctx->conn;
tasklet_free(ctx->wait_event.tasklet);
if (conn && ctx->wait_event.events != 0)
conn->xprt->unsubscribe(conn, conn->xprt_ctx, ctx->wait_event.events,
&ctx->wait_event);
pool_free(pool_head_pt_ctx, ctx);
}
if (conn) {
conn->mux = NULL;
conn->ctx = NULL;
conn_stop_tracking(conn); conn_stop_tracking(conn);
conn_full_close(conn); conn_full_close(conn);
tasklet_free(ctx->wait_event.tasklet);
conn->mux = NULL;
conn->ctx = NULL;
if (conn->destroy_cb) if (conn->destroy_cb)
conn->destroy_cb(conn); conn->destroy_cb(conn);
/* We don't bother unsubscribing here, as we're about to destroy
* both the connection and the mux_pt_ctx
*/
conn_free(conn); conn_free(conn);
} }
pool_free(pool_head_pt_ctx, ctx);
} }
/* Callback, used when we get I/Os while in idle mode */ /* Callback, used when we get I/Os while in idle mode */