Mercurial > hg > nginx
diff src/event/ngx_event_accept.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 | fc9909c369b2 |
children | b1648294f693 |
line wrap: on
line diff
--- a/src/event/ngx_event_accept.c Fri Mar 04 14:06:57 2005 +0000 +++ b/src/event/ngx_event_accept.c Sat Mar 19 12:38:37 2005 +0000 @@ -16,7 +16,10 @@ void ngx_event_accept(ngx_event_t *ev) { - ngx_uint_t instance, accepted; + ngx_uint_t instance; +#if 0 + ngx_uint_t accepted; +#endif socklen_t len; struct sockaddr *sa; ngx_err_t err; @@ -43,8 +46,10 @@ &ls->listening->addr_text, ev->available); ev->ready = 0; + pool = NULL; +#if 0 accepted = 0; - pool = NULL; +#endif do { @@ -56,17 +61,20 @@ * case and besides the pool can be got from the free pool list. */ - if (!(pool = ngx_create_pool(ls->listening->pool_size, ev->log))) { + pool = ngx_create_pool(ls->listening->pool_size, ev->log); + if (pool == NULL) { return; } } - if (!(sa = ngx_palloc(pool, ls->listening->socklen))) { + sa = ngx_palloc(pool, ls->listening->socklen); + if (sa == NULL) { ngx_destroy_pool(pool); return; } - if (!(log = ngx_palloc(pool, sizeof(ngx_log_t)))) { + log = ngx_palloc(pool, sizeof(ngx_log_t)); + if (log == NULL) { ngx_destroy_pool(pool); return; } @@ -331,7 +339,9 @@ ev->available--; } +#if 0 accepted++; +#endif } while (ev->available); }