Mercurial > hg > nginx
diff src/event/modules/ngx_poll_module.c @ 501:d4ea69372b94 release-0.1.25
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.
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Sat, 19 Mar 2005 12:38:37 +0000 |
parents | 64d9afb209da |
children | 9b8c906f6e63 |
line wrap: on
line diff
--- a/src/event/modules/ngx_poll_module.c Fri Mar 04 14:06:57 2005 +0000 +++ b/src/event/modules/ngx_poll_module.c Sat Mar 19 12:38:37 2005 +0000 @@ -73,10 +73,11 @@ || cycle->old_cycle == NULL || cycle->old_cycle->connection_n < cycle->connection_n) { - ngx_test_null(list, - ngx_alloc(sizeof(struct pollfd) * cycle->connection_n, - cycle->log), - NGX_ERROR); + list = ngx_alloc(sizeof(struct pollfd) * cycle->connection_n, + cycle->log); + if (list == NULL) { + return NGX_ERROR; + } if (event_list) { ngx_memcpy(list, event_list, sizeof(ngx_event_t *) * nevents); @@ -90,10 +91,11 @@ ngx_free(ready_index); } - ngx_test_null(ready_index, - ngx_alloc(sizeof(ngx_event_t *) * 2 * cycle->connection_n, - cycle->log), - NGX_ERROR); + ready_index = ngx_alloc(sizeof(ngx_event_t *) * 2 * cycle->connection_n, + cycle->log); + if (ready_index == NULL) { + return NGX_ERROR; + } #endif }