diff options
author | Igor Sysoev <igor@sysoev.ru> | 2005-11-26 13:11:11 +0300 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2005-11-26 13:11:11 +0300 |
commit | c31a9bb5e336b15f48c875e1f448f71d68f3feb9 (patch) | |
tree | 31ae2b332d1b263c858bab6ee4c21778403f181d /src/core/ngx_palloc.c | |
parent | 99d9a4b4c547800d582a96871416797fb446b02b (diff) |
nginx-0.3.12-RELEASE importrelease-0.3.12
*) Security: if nginx was built with the ngx_http_realip_module and the
"satisfy_any on" directive was used, then access and authorization
directives did not work. The ngx_http_realip_module was not built
and is not built by default.
*) Change: the "$time_gmt" variable name was changed to "$time_local".
*) Change: the "proxy_header_buffer_size" and
"fastcgi_header_buffer_size" directives was renamed to the
"proxy_buffer_size" and "fastcgi_buffer_size" directives.
*) Feature: the ngx_http_memcached_module.
*) Feature: the "proxy_buffering" directive.
*) Bugfix: the changes in accept mutex handling when the "rtsig" method
was used; the bug had appeared in 0.3.0.
*) Bugfix: if the client sent the "Transfer-Encoding: chunked" header
line, then nginx returns the 411 error.
*) Bugfix: if the "auth_basic" directive was inherited from the http
level, then the realm in the "WWW-Authenticate" header line was
without the "Basic realm" text.
*) Bugfix: if the "combined" format was explicitly specified in the
"access_log" directive, then the empty lines was written to the log;
the bug had appeared in 0.3.8.
*) Bugfix: nginx did not run on the sparc platform under any OS except
Solaris.
*) Bugfix: now it is not necessary to place space between the quoted
string and closing bracket in the "if" directive.
Diffstat (limited to 'src/core/ngx_palloc.c')
-rw-r--r-- | src/core/ngx_palloc.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/core/ngx_palloc.c b/src/core/ngx_palloc.c index d1e7bbdc5..a1f9d59cd 100644 --- a/src/core/ngx_palloc.c +++ b/src/core/ngx_palloc.c @@ -20,9 +20,10 @@ ngx_create_pool(size_t size, ngx_log_t *log) p->last = (u_char *) p + sizeof(ngx_pool_t); p->end = (u_char *) p + size; + p->current = p; + p->chain = NULL; p->next = NULL; p->large = NULL; - p->chain = NULL; p->cleanup = NULL; p->log = log; @@ -91,7 +92,7 @@ ngx_palloc(ngx_pool_t *pool, size_t size) && size <= (size_t) (pool->end - (u_char *) pool) - (size_t) ngx_align(sizeof(ngx_pool_t))) { - for (p = pool, n = pool->next; /* void */; p = n, n = n->next) { + for (p = pool->current; /* void */ ; p = p->next) { m = ngx_align(p->last); if ((size_t) (p->end - m) >= size) { @@ -100,7 +101,11 @@ ngx_palloc(ngx_pool_t *pool, size_t size) return m; } - if (n == NULL) { + if ((size_t) (p->end - m) < NGX_ALIGNMENT) { + p->current = p->next; + } + + if (p->next == NULL) { break; } } @@ -112,6 +117,10 @@ ngx_palloc(ngx_pool_t *pool, size_t size) return NULL; } + if (p->current == NULL) { + p->current = n; + } + p->next = n; m = ngx_align(n->last); n->last = m + size; |