diff options
author | Igor Sysoev <igor@sysoev.ru> | 2005-02-03 19:33:37 +0000 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2005-02-03 19:33:37 +0000 |
commit | 805d9db723e74bbe84e6df1be29fda28abcc23ea (patch) | |
tree | 7283a5779fba6f4b6048e29cfadeca41428ed773 /src/core/ngx_array.c | |
parent | f3a7b14931aa1e99a31780a93882a5c2e8810c41 (diff) | |
download | nginx-805d9db723e74bbe84e6df1be29fda28abcc23ea.tar.gz nginx-805d9db723e74bbe84e6df1be29fda28abcc23ea.zip |
nginx-0.1.17-RELEASE importrelease-0.1.17
*) Change: the ngx_http_rewrite_module was rewritten from the scratch.
Now it is possible to redirect, to return the error codes, to check
the variables and referrers. The directives can be used inside
locations. The redirect directive was canceled.
*) Feature: the ngx_http_geo_module.
*) Feature: the proxy_set_x_var and fastcgi_set_var directives.
*) Bugfix: the location configuration with "=" modifier may be used in
another location.
*) Bugfix: the correct content type was set only for requests that use
small caps letters in extension.
*) Bugfix: if the proxy_pass or fastcgi_pass directives were set in the
location, and access was denied, and the error was redirected to a
static page, then the segmentation fault occurred.
*) Bugfix: if in a proxied "Location" header was a relative URL, then a
host name and a slash were added to them; the bug had appeared in
0.1.14.
*) Bugfix: the system error message was not logged on Linux.
Diffstat (limited to 'src/core/ngx_array.c')
-rw-r--r-- | src/core/ngx_array.c | 99 |
1 files changed, 81 insertions, 18 deletions
diff --git a/src/core/ngx_array.c b/src/core/ngx_array.c index 6eae76ffd..82d5d1db8 100644 --- a/src/core/ngx_array.c +++ b/src/core/ngx_array.c @@ -8,67 +8,130 @@ #include <ngx_core.h> -ngx_array_t *ngx_create_array(ngx_pool_t *p, ngx_uint_t n, size_t size) +ngx_array_t *ngx_array_create(ngx_pool_t *p, ngx_uint_t n, size_t size) { ngx_array_t *a; - ngx_test_null(a, ngx_palloc(p, sizeof(ngx_array_t)), NULL); + if (!(a = ngx_palloc(p, sizeof(ngx_array_t)))) { + return NULL; + } - ngx_test_null(a->elts, ngx_palloc(p, n * size), NULL); + if (!(a->elts = ngx_palloc(p, n * size))) { + return NULL; + } - a->pool = p; a->nelts = 0; - a->nalloc = n; a->size = size; + a->nalloc = n; + a->pool = p; return a; } -void ngx_destroy_array(ngx_array_t *a) +void ngx_array_destroy(ngx_array_t *a) { ngx_pool_t *p; p = a->pool; - if ((char *) a->elts + a->size * a->nalloc == p->last) { + if ((u_char *) a->elts + a->size * a->nalloc == p->last) { p->last -= a->size * a->nalloc; } - if ((char *) a + sizeof(ngx_array_t) == p->last) { - p->last = (char *) a; + if ((u_char *) a + sizeof(ngx_array_t) == p->last) { + p->last = (u_char *) a; } } -void *ngx_push_array(ngx_array_t *a) +void *ngx_array_push(ngx_array_t *a) { void *elt, *new; + size_t size; ngx_pool_t *p; - /* array is full */ if (a->nelts == a->nalloc) { + + /* the array is full */ + + size = a->size * a->nalloc; + p = a->pool; - /* array allocation is the last in the pool */ - if ((char *) a->elts + a->size * a->nelts == p->last - && (unsigned) (p->end - p->last) >= a->size) + 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++; - /* allocate new array */ } else { - ngx_test_null(new, ngx_palloc(p, 2 * a->nalloc * a->size), NULL); + /* allocate a new array */ + + if (!(new = ngx_palloc(p, 2 * size))) { + return NULL; + } - ngx_memcpy(new, a->elts, a->nalloc * a->size); + ngx_memcpy(new, a->elts, size); a->elts = new; a->nalloc *= 2; } } - elt = (char *) a->elts + a->size * a->nelts; + 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); + + if (!(new = ngx_palloc(p, nalloc * a->size))) { + 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; +} |