Mercurial > hg > nginx
changeset 4907:01d3d3a185e9 stable-1.2
Merge of r4892: keepalive memory usage optimization.
The ngx_http_keepalive_handler() function is now trying to not
keep c->buffer's memory for idle connections.
This behaviour is consistent with the ngx_http_set_keepalive()
function and it should decrease memory usage in some cases (especially
if epoll/rtsig is used).
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Tue, 13 Nov 2012 11:21:31 +0000 |
parents | bc92e877d36d |
children | 826ca1b53376 |
files | src/http/ngx_http_request.c |
diffstat | 1 files changed, 14 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/ngx_http_request.c Tue Nov 13 11:00:37 2012 +0000 +++ b/src/http/ngx_http_request.c Tue Nov 13 11:21:31 2012 +0000 @@ -2745,6 +2745,20 @@ ngx_http_close_connection(c); } + /* + * Like ngx_http_set_keepalive() we are trying to not hold + * c->buffer's memory for a keepalive connection. + */ + + if (ngx_pfree(c->pool, b->start) == NGX_OK) { + + /* + * the special note that c->buffer's memory was freed + */ + + b->pos = NULL; + } + return; }