5ee6efabb0
*) Bugfix: nginx did run on Linux parisc.
*) Feature: nginx now does not start under FreeBSD if the sysctl
kern.ipc.somaxconn value is too big.
*) Bugfix: if a request was internally redirected by the
ngx_http_index_module module to the ngx_http_proxy_module or
ngx_http_fastcgi_module modules, then the index file was not closed
after request completion.
*) Feature: the "proxy_pass" can be used in location with regular
expression.
*) Feature: the ngx_http_rewrite_filter_module module supports the
condition like "if ($HTTP_USER_AGENT ~ MSIE)".
*) Bugfix: nginx started too slow if the large number of addresses and
text values were used in the "geo" directive.
*) Change: a variable name must be declared as "$name" in the "geo"
directive. The previous variant without "$" is still supported, but
will be removed soon.
*) Feature: the "%{VARIABLE}v" logging parameter.
*) Feature: the "set $name value" directive.
*) Bugfix: gcc 4.0 compatibility.
*) Feature: the --with-openssl-opt=OPTIONS autoconfiguration directive.
141 lines
2.7 KiB
C
141 lines
2.7 KiB
C
|
|
/*
|
|
* Copyright (C) Igor Sysoev
|
|
*/
|
|
|
|
|
|
#include <ngx_config.h>
|
|
#include <ngx_core.h>
|
|
|
|
|
|
ngx_array_t *ngx_array_create(ngx_pool_t *p, ngx_uint_t n, size_t size)
|
|
{
|
|
ngx_array_t *a;
|
|
|
|
a = ngx_palloc(p, sizeof(ngx_array_t));
|
|
if (a == NULL) {
|
|
return NULL;
|
|
}
|
|
|
|
a->elts = ngx_palloc(p, n * size);
|
|
if (a->elts == NULL) {
|
|
return NULL;
|
|
}
|
|
|
|
a->nelts = 0;
|
|
a->size = size;
|
|
a->nalloc = n;
|
|
a->pool = p;
|
|
|
|
return a;
|
|
}
|
|
|
|
|
|
void ngx_array_destroy(ngx_array_t *a)
|
|
{
|
|
ngx_pool_t *p;
|
|
|
|
p = a->pool;
|
|
|
|
if ((u_char *) a->elts + a->size * a->nalloc == p->last) {
|
|
p->last -= a->size * a->nalloc;
|
|
}
|
|
|
|
if ((u_char *) a + sizeof(ngx_array_t) == p->last) {
|
|
p->last = (u_char *) a;
|
|
}
|
|
}
|
|
|
|
|
|
void *ngx_array_push(ngx_array_t *a)
|
|
{
|
|
void *elt, *new;
|
|
size_t size;
|
|
ngx_pool_t *p;
|
|
|
|
if (a->nelts == a->nalloc) {
|
|
|
|
/* the array is full */
|
|
|
|
size = a->size * a->nalloc;
|
|
|
|
p = a->pool;
|
|
|
|
if ((u_char *) a->elts + size == p->last && p->last + a->size <= p->end)
|
|
{
|
|
/*
|
|
* the array allocation is the last in the pool
|
|
* and there is space for new allocation
|
|
*/
|
|
|
|
p->last += a->size;
|
|
a->nalloc++;
|
|
|
|
} else {
|
|
/* allocate a new array */
|
|
|
|
new = ngx_palloc(p, 2 * size);
|
|
if (new == NULL) {
|
|
return NULL;
|
|
}
|
|
|
|
ngx_memcpy(new, a->elts, size);
|
|
a->elts = new;
|
|
a->nalloc *= 2;
|
|
}
|
|
}
|
|
|
|
elt = (u_char *) a->elts + a->size * a->nelts;
|
|
a->nelts++;
|
|
|
|
return elt;
|
|
}
|
|
|
|
|
|
void *ngx_array_push_n(ngx_array_t *a, ngx_uint_t n)
|
|
{
|
|
void *elt, *new;
|
|
size_t size;
|
|
ngx_uint_t nalloc;
|
|
ngx_pool_t *p;
|
|
|
|
size = n * a->size;
|
|
|
|
if (a->nelts + n > a->nalloc) {
|
|
|
|
/* the array is full */
|
|
|
|
p = a->pool;
|
|
|
|
if ((u_char *) a->elts + a->size * a->nalloc == p->last
|
|
&& p->last + size <= p->end)
|
|
{
|
|
/*
|
|
* the array allocation is the last in the pool
|
|
* and there is space for new allocation
|
|
*/
|
|
|
|
p->last += size;
|
|
a->nalloc += n;
|
|
|
|
} else {
|
|
/* allocate a new array */
|
|
|
|
nalloc = 2 * ((n >= a->nalloc) ? n : a->nalloc);
|
|
|
|
new = ngx_palloc(p, nalloc * a->size);
|
|
if (new == NULL) {
|
|
return NULL;
|
|
}
|
|
|
|
ngx_memcpy(new, a->elts, a->nelts * a->size);
|
|
a->elts = new;
|
|
a->nalloc = nalloc;
|
|
}
|
|
}
|
|
|
|
elt = (u_char *) a->elts + a->size * a->nelts;
|
|
a->nelts += n;
|
|
|
|
return elt;
|
|
}
|