Skip to content

fix: close the connection before destroying its pool #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jarvis9443 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: close the connection before destroying its pool #22

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions ngx_http_multi_upstream_module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -727,6 +727,8 @@ ngx_http_multi_upstream_connection_detach(ngx_connection_t *c)
ngx_int_t
ngx_http_multi_upstream_connection_close(ngx_connection_t *c)
{
ngx_pool_t *pool;

#if (NGX_HTTP_SSL)
/* TODO: do not shutdown persistent connection */
if (c->ssl) {
Expand All @@ -746,14 +748,20 @@ ngx_http_multi_upstream_connection_close(ngx_connection_t *c)
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
"multi: close http upstream connection: %d", c->fd);

if (c->pool) {
ngx_destroy_pool(c->pool);
}

c->destroyed = 1;

/* ngx_close_connection() still logs through c->log, which lives in c->pool,
* so the pool has to outlive it - the same order ngx_http_close_connection()
* uses */
pool = c->pool;
c->pool = NULL;

ngx_close_connection(c);

if (pool) {
ngx_destroy_pool(pool);
}

return NGX_OK;
}

Expand Down