nginx-0.1.25-RELEASE import
*) 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.
diff --git a/src/core/ngx_array.h b/src/core/ngx_array.h
index d90cf76..5f97451 100644
--- a/src/core/ngx_array.h
+++ b/src/core/ngx_array.h
@@ -27,10 +27,11 @@
void *ngx_array_push_n(ngx_array_t *a, ngx_uint_t n);
-static ngx_inline ngx_int_t ngx_array_init(ngx_array_t *array, ngx_pool_t *pool,
- ngx_uint_t n, size_t size)
+static ngx_inline ngx_int_t
+ngx_array_init(ngx_array_t *array, ngx_pool_t *pool, ngx_uint_t n, size_t size)
{
- if (!(array->elts = ngx_palloc(pool, n * size))) {
+ array->elts = ngx_palloc(pool, n * size);
+ if (array->elts == NULL) {
return NGX_ERROR;
}
@@ -43,14 +44,4 @@
}
-/* STUB */
-#define ngx_init_array(a, p, n, s, rc) \
- ngx_test_null(a.elts, ngx_palloc(p, n * s), rc); \
- a.nelts = 0; a.size = s; a.nalloc = n; a.pool = p;
-
-#define ngx_create_array ngx_array_create
-#define ngx_push_array ngx_array_push
-/**/
-
-
#endif /* _NGX_ARRAY_H_INCLUDED_ */
