summaryrefslogtreecommitdiff
path: root/src/http/ngx_http_busy_lock.c
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2005-03-19 12:35:58 +0000
committerJonathan Kolb <jon@b0g.us>2005-03-19 12:35:58 +0000
commitc70429eafad3bdd2172cc50f1b0507668ba0dfcc (patch)
tree6b91ea2a89d0cec23dc90565b7fb7e6ebf3a131d /src/http/ngx_http_busy_lock.c
parentc5e300ff4b3366bcafaa41e44b8981c992669cec (diff)
downloadnginx-c70429eafad3bdd2172cc50f1b0507668ba0dfcc.tar.gz
Changes with nginx 0.1.25 19 Mar 2005v0.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/http/ngx_http_busy_lock.c')
-rw-r--r--src/http/ngx_http_busy_lock.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/http/ngx_http_busy_lock.c b/src/http/ngx_http_busy_lock.c
index 2b3ee105d..fe04390a1 100644
--- a/src/http/ngx_http_busy_lock.c
+++ b/src/http/ngx_http_busy_lock.c
@@ -205,13 +205,15 @@ char *ngx_http_set_busy_lock_slot(ngx_conf_t *cf, ngx_command_t *cmd,
}
/* ngx_calloc_shared() */
- if (!(bl = ngx_pcalloc(cf->pool, sizeof(ngx_http_busy_lock_t)))) {
+ bl = ngx_pcalloc(cf->pool, sizeof(ngx_http_busy_lock_t));
+ if (bl == NULL) {
return NGX_CONF_ERROR;
}
*blp = bl;
/* ngx_calloc_shared() */
- if (!(bl->mutex = ngx_pcalloc(cf->pool, sizeof(ngx_event_mutex_t)))) {
+ bl->mutex = ngx_pcalloc(cf->pool, sizeof(ngx_event_mutex_t));
+ if (bl->mutex == NULL) {
return NGX_CONF_ERROR;
}