aboutsummaryrefslogtreecommitdiff
path: root/src/core/ngx_array.c
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2005-03-19 12:38:37 +0000
committerIgor Sysoev <igor@sysoev.ru>2005-03-19 12:38:37 +0000
commitc15717285d2157a603bb1b130b26d7baa549be7e (patch)
tree56dc8346b22bb2660eecd3bc086d263ac6d67326 /src/core/ngx_array.c
parente12fbfe82a176cd386cdcecfeabf43ac8fd870a4 (diff)
downloadnginx-release-0.1.25.tar.gz
nginx-release-0.1.25.zip
nginx-0.1.25-RELEASE importrelease-0.1.25
*) 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.
Diffstat (limited to 'src/core/ngx_array.c')
-rw-r--r--src/core/ngx_array.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/core/ngx_array.c b/src/core/ngx_array.c
index 82d5d1db8..b6167afc4 100644
--- a/src/core/ngx_array.c
+++ b/src/core/ngx_array.c
@@ -12,11 +12,13 @@ ngx_array_t *ngx_array_create(ngx_pool_t *p, ngx_uint_t n, size_t size)
{
ngx_array_t *a;
- if (!(a = ngx_palloc(p, sizeof(ngx_array_t)))) {
+ a = ngx_palloc(p, sizeof(ngx_array_t));
+ if (a == NULL) {
return NULL;
}
- if (!(a->elts = ngx_palloc(p, n * size))) {
+ a->elts = ngx_palloc(p, n * size);
+ if (a->elts == NULL) {
return NULL;
}
@@ -72,7 +74,8 @@ void *ngx_array_push(ngx_array_t *a)
} else {
/* allocate a new array */
- if (!(new = ngx_palloc(p, 2 * size))) {
+ new = ngx_palloc(p, 2 * size);
+ if (new == NULL) {
return NULL;
}
@@ -120,7 +123,8 @@ void *ngx_array_push_n(ngx_array_t *a, ngx_uint_t n)
nalloc = 2 * ((n >= a->nalloc) ? n : a->nalloc);
- if (!(new = ngx_palloc(p, nalloc * a->size))) {
+ new = ngx_palloc(p, nalloc * a->size);
+ if (new == NULL) {
return NULL;
}