aboutsummaryrefslogtreecommitdiff
path: root/src/event/ngx_event_acceptex.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/event/ngx_event_acceptex.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/event/ngx_event_acceptex.c')
-rw-r--r--src/event/ngx_event_acceptex.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/event/ngx_event_acceptex.c b/src/event/ngx_event_acceptex.c
index d01dbf122..b02dfd0d5 100644
--- a/src/event/ngx_event_acceptex.c
+++ b/src/event/ngx_event_acceptex.c
@@ -153,7 +153,8 @@ int ngx_event_post_acceptex(ngx_listening_t *ls, int n)
c->recv = ngx_recv;
c->send_chain = ngx_send_chain;
- if (!(c->pool = ngx_create_pool(ls->pool_size, ls->log))) {
+ c->pool = ngx_create_pool(ls->pool_size, ls->log);
+ if (c->pool == NULL) {
return NGX_ERROR;
}
@@ -164,15 +165,18 @@ int ngx_event_post_acceptex(ngx_listening_t *ls, int n)
return NGX_ERROR;
}
- if (!(c->local_sockaddr = ngx_palloc(c->pool, ls->socklen))) {
+ c->local_sockaddr = ngx_palloc(c->pool, ls->socklen);
+ if (c->local_sockaddr == NULL) {
return NGX_ERROR;
}
- if (!(c->sockaddr = ngx_palloc(c->pool, ls->socklen))) {
+ c->sockaddr = ngx_palloc(c->pool, ls->socklen);
+ if (c->sockaddr == NULL) {
return NGX_ERROR;
}
- if (!(c->log = ngx_palloc(c->pool, sizeof(ngx_log_t)))) {
+ c->log = ngx_palloc(c->pool, sizeof(ngx_log_t));
+ if (c->log == NULL) {
return NGX_ERROR;
}