summaryrefslogtreecommitdiff
path: root/src/core/ngx_palloc.c
diff options
context:
space:
mode:
authornginx <nginx@nginx.org>2014-07-08 13:45:06 +0000
committerJon Kolb <kolbyjack@gmail.com>2014-07-08 13:45:06 +0000
commit251331cd59f780fca94bef334f58a6e311e4ad32 (patch)
tree529cad425bb96637cb24ee746ea34f598f40a237 /src/core/ngx_palloc.c
parenta995714bb2b96df7f846a8eec89715000f0699dd (diff)
downloadnginx-1.7.3.tar.gz
Changes with nginx 1.7.3 08 Jul 2014v1.7.3
*) Feature: weak entity tags are now preserved on response modifications, and strong ones are changed to weak. *) Feature: cache revalidation now uses If-None-Match header if possible. *) Feature: the "ssl_password_file" directive. *) Bugfix: the If-None-Match request header line was ignored if there was no Last-Modified header in a response returned from cache. *) Bugfix: "peer closed connection in SSL handshake" messages were logged at "info" level instead of "error" while connecting to backends. *) Bugfix: in the ngx_http_dav_module module in nginx/Windows. *) Bugfix: SPDY connections might be closed prematurely if caching was used.
Diffstat (limited to 'src/core/ngx_palloc.c')
-rw-r--r--src/core/ngx_palloc.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/core/ngx_palloc.c b/src/core/ngx_palloc.c
index 1f70f9eee..ef4a64771 100644
--- a/src/core/ngx_palloc.c
+++ b/src/core/ngx_palloc.c
@@ -181,7 +181,7 @@ ngx_palloc_block(ngx_pool_t *pool, size_t size)
{
u_char *m;
size_t psize;
- ngx_pool_t *p, *new, *current;
+ ngx_pool_t *p, *new;
psize = (size_t) (pool->d.end - (u_char *) pool);
@@ -200,18 +200,14 @@ ngx_palloc_block(ngx_pool_t *pool, size_t size)
m = ngx_align_ptr(m, NGX_ALIGNMENT);
new->d.last = m + size;
- current = pool->current;
-
- for (p = current; p->d.next; p = p->d.next) {
+ for (p = pool->current; p->d.next; p = p->d.next) {
if (p->d.failed++ > 4) {
- current = p->d.next;
+ pool->current = p->d.next;
}
}
p->d.next = new;
- pool->current = current ? current : new;
-
return m;
}