Mercurial > hg > nginx-vendor-0-7
diff src/event/modules/ngx_devpoll_module.c @ 50:72eb30262aac NGINX_0_1_25
nginx 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.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Sat, 19 Mar 2005 00:00:00 +0300 |
parents | 6cfc63e68377 |
children | b55cbf18157e |
line wrap: on
line diff
--- a/src/event/modules/ngx_devpoll_module.c +++ b/src/event/modules/ngx_devpoll_module.c @@ -134,19 +134,21 @@ ngx_devpoll_init(ngx_cycle_t *cycle) ngx_free(change_list); } - ngx_test_null(change_list, - ngx_alloc(sizeof(struct pollfd) * dpcf->changes, - cycle->log), - NGX_ERROR); + change_list = ngx_alloc(sizeof(struct pollfd) * dpcf->changes, + cycle->log); + if (change_list == NULL) { + return NGX_ERROR; + } if (change_index) { ngx_free(change_index); } - ngx_test_null(change_index, - ngx_alloc(sizeof(ngx_event_t *) * dpcf->changes, - cycle->log), - NGX_ERROR); + change_index = ngx_alloc(sizeof(ngx_event_t *) * dpcf->changes, + cycle->log); + if (change_index == NULL) { + return NGX_ERROR; + } } max_changes = dpcf->changes; @@ -156,10 +158,11 @@ ngx_devpoll_init(ngx_cycle_t *cycle) ngx_free(event_list); } - ngx_test_null(event_list, - ngx_alloc(sizeof(struct pollfd) * dpcf->events, - cycle->log), - NGX_ERROR); + event_list = ngx_alloc(sizeof(struct pollfd) * dpcf->events, + cycle->log); + if (event_list == NULL) { + return NGX_ERROR; + } } nevents = dpcf->events; @@ -318,11 +321,13 @@ ngx_devpoll_process_events(ngx_cycle_t * { int events, revents; ngx_int_t i; - ngx_uint_t j, lock, accept_lock, expire; + ngx_uint_t lock, accept_lock, expire; size_t n; ngx_msec_t timer; ngx_err_t err; +#if 0 ngx_cycle_t **old_cycle; +#endif ngx_event_t *rev, *wev; ngx_connection_t *c; ngx_epoch_msec_t delta; @@ -580,8 +585,10 @@ ngx_devpoll_create_conf(ngx_cycle_t *cyc { ngx_devpoll_conf_t *dpcf; - ngx_test_null(dpcf, ngx_palloc(cycle->pool, sizeof(ngx_devpoll_conf_t)), - NGX_CONF_ERROR); + dpcf = ngx_palloc(cycle->pool, sizeof(ngx_devpoll_conf_t)); + if (dpcf == NULL) { + return NGX_CONF_ERROR; + } dpcf->changes = NGX_CONF_UNSET; dpcf->events = NGX_CONF_UNSET;