mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-12 02:09:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Upstream: separate pool for peer connections.

Browse Source 
This is required to support persistent https connections as various ssl
structures are allocated from connection's pool.
This commit is contained in:
Maxim Dounin 2011-09-15 18:21:24 +00:00
parent c42c70f478
commit 360ed25d65
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/http/ngx_http_upstream.c
View File

@ -1136,8 +1136,20 @@ ngx_http_upstream_connect(ngx_http_request_t *r, ngx_http_upstream_t *u)
c->sendfile &= r->connection->sendfile; c->sendfile &= r->connection->sendfile;
u->output.sendfile = c->sendfile; u->output.sendfile = c->sendfile;
c->pool = r->pool; if (c->pool == NULL) {
/* we need separate pool here to be able to cache SSL connections */
c->pool = ngx_create_pool(128, r->connection->log);
if (c->pool == NULL) {
ngx_http_upstream_finalize_request(r, u,
NGX_HTTP_INTERNAL_SERVER_ERROR);
return;
}
}
c->log = r->connection->log; c->log = r->connection->log;
c->pool->log = c->log;
c->read->log = c->log; c->read->log = c->log;
c->write->log = c->log; c->write->log = c->log;
@ -2890,6 +2902,7 @@ ngx_http_upstream_next(ngx_http_request_t *r, ngx_http_upstream_t *u,
} }
#endif #endif
ngx_destroy_pool(u->peer.connection->pool);
ngx_close_connection(u->peer.connection); ngx_close_connection(u->peer.connection);
} }
@ -2984,6 +2997,7 @@ ngx_http_upstream_finalize_request(ngx_http_request_t *r,
"close http upstream connection: %d", "close http upstream connection: %d",
u->peer.connection->fd); u->peer.connection->fd);
ngx_destroy_pool(u->peer.connection->pool);
ngx_close_connection(u->peer.connection); ngx_close_connection(u->peer.connection);
} }