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.
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index c773d8f..620d2e9 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -785,7 +785,8 @@
}
if (i < r->exten.len) {
- if (!(p = ngx_palloc(r->pool, r->exten.len))) {
+ p = ngx_palloc(r->pool, r->exten.len);
+ if (p == NULL) {
return NGX_HTTP_INTERNAL_SERVER_ERROR;
}
@@ -897,7 +898,8 @@
r->exten.len = r->uri.len - i - 1;
if (r->exten.len > 0) {
- if (!(r->exten.data = ngx_palloc(r->pool, r->exten.len + 1))) {
+ r->exten.data = ngx_palloc(r->pool, r->exten.len + 1);
+ if (r->exten.data == NULL) {
return NGX_ERROR;
}
@@ -997,7 +999,8 @@
ngx_http_core_srv_conf_t *cscf, **cscfp;
ngx_http_core_main_conf_t *cmcf;
- if (!(ctx = ngx_pcalloc(cf->pool, sizeof(ngx_http_conf_ctx_t)))) {
+ ctx = ngx_pcalloc(cf->pool, sizeof(ngx_http_conf_ctx_t));
+ if (ctx == NULL) {
return NGX_CONF_ERROR;
}
@@ -1026,7 +1029,8 @@
module = ngx_modules[m]->ctx;
if (module->create_srv_conf) {
- if (!(mconf = module->create_srv_conf(cf))) {
+ mconf = module->create_srv_conf(cf);
+ if (mconf == NULL) {
return NGX_CONF_ERROR;
}
@@ -1034,7 +1038,8 @@
}
if (module->create_loc_conf) {
- if (!(mconf = module->create_loc_conf(cf))) {
+ mconf = module->create_loc_conf(cf);
+ if (mconf == NULL) {
return NGX_CONF_ERROR;
}
@@ -1051,7 +1056,8 @@
cmcf = ctx->main_conf[ngx_http_core_module.ctx_index];
- if (!(cscfp = ngx_array_push(&cmcf->servers))) {
+ cscfp = ngx_array_push(&cmcf->servers);
+ if (cscfp == NULL) {
return NGX_CONF_ERROR;
}
@@ -1095,7 +1101,8 @@
u_char errstr[NGX_MAX_CONF_ERRSTR];
#endif
- if (!(ctx = ngx_pcalloc(cf->pool, sizeof(ngx_http_conf_ctx_t)))) {
+ ctx = ngx_pcalloc(cf->pool, sizeof(ngx_http_conf_ctx_t));
+ if (ctx == NULL) {
return NGX_CONF_ERROR;
}
@@ -1181,7 +1188,9 @@
if (pclcf->name.len == 0) {
cscf = ctx->srv_conf[ngx_http_core_module.ctx_index];
- if (!(clcfp = ngx_array_push(&cscf->locations))) {
+
+ clcfp = ngx_array_push(&cscf->locations);
+ if (clcfp == NULL) {
return NGX_CONF_ERROR;
}
@@ -1214,11 +1223,15 @@
}
if (pclcf->locations.elts == NULL) {
- ngx_init_array(pclcf->locations, cf->pool, 4, sizeof(void *),
- NGX_CONF_ERROR);
+ if (ngx_array_init(&pclcf->locations, cf->pool, 4, sizeof(void *))
+ != NGX_OK)
+ {
+ return NGX_CONF_ERROR;
+ }
}
- if (!(clcfp = ngx_push_array(&pclcf->locations))) {
+ clcfp = ngx_array_push(&pclcf->locations);
+ if (clcfp == NULL) {
return NGX_CONF_ERROR;
}
}
@@ -1347,7 +1360,8 @@
for (i = 1; i < cf->args->nelts; i++) {
ngx_http_types_hash_key(key, value[i]);
- if (!(type = ngx_array_push(&lcf->types[key]))) {
+ type = ngx_array_push(&lcf->types[key]);
+ if (type == NULL) {
return NGX_CONF_ERROR;
}
@@ -1364,7 +1378,8 @@
{
ngx_http_core_main_conf_t *cmcf;
- if (!(cmcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_core_main_conf_t)))) {
+ cmcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_core_main_conf_t));
+ if (cmcf == NULL) {
return NGX_CONF_ERROR;
}
@@ -1403,7 +1418,8 @@
{
ngx_http_core_srv_conf_t *cscf;
- if (!(cscf = ngx_pcalloc(cf->pool, sizeof(ngx_http_core_srv_conf_t)))) {
+ cscf = ngx_pcalloc(cf->pool, sizeof(ngx_http_core_srv_conf_t));
+ if (cscf == NULL) {
return NGX_CONF_ERROR;
}
@@ -1455,7 +1471,8 @@
/* TODO: it does not merge, it inits only */
if (conf->listen.nelts == 0) {
- if (!(ls = ngx_array_push(&conf->listen))) {
+ ls = ngx_array_push(&conf->listen);
+ if (ls == NULL) {
return NGX_CONF_ERROR;
}
@@ -1470,11 +1487,13 @@
}
if (conf->server_names.nelts == 0) {
- if (!(sn = ngx_array_push(&conf->server_names))) {
+ sn = ngx_array_push(&conf->server_names);
+ if (sn == NULL) {
return NGX_CONF_ERROR;
}
- if (!(sn->name.data = ngx_palloc(cf->pool, NGX_MAXHOSTNAMELEN))) {
+ sn->name.data = ngx_palloc(cf->pool, NGX_MAXHOSTNAMELEN);
+ if (sn->name.data == NULL) {
return NGX_CONF_ERROR;
}
@@ -1528,7 +1547,8 @@
{
ngx_http_core_loc_conf_t *lcf;
- if (!(lcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_core_loc_conf_t)))) {
+ lcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_core_loc_conf_t));
+ if (lcf == NULL) {
return NGX_CONF_ERROR;
}
@@ -1618,7 +1638,8 @@
ngx_http_types_hash_key(key,
ngx_http_core_default_types[i].exten);
- if (!(type = ngx_array_push(&conf->types[key]))) {
+ type = ngx_array_push(&conf->types[key]);
+ if (type == NULL) {
return NGX_CONF_ERROR;
}
@@ -1700,7 +1721,8 @@
* add resolved name to server names ???
*/
- if (!(ls = ngx_array_push(&scf->listen))) {
+ ls = ngx_array_push(&scf->listen);
+ if (ls == NULL) {
return NGX_CONF_ERROR;
}
@@ -1796,7 +1818,8 @@
return NGX_CONF_ERROR;
}
- if (!(sn = ngx_array_push(&scf->server_names))) {
+ sn = ngx_array_push(&scf->server_names);
+ if (sn == NULL) {
return NGX_CONF_ERROR;
}
@@ -1908,7 +1931,8 @@
}
for (i = 1; i < cf->args->nelts - n; i++) {
- if (!(err = ngx_array_push(lcf->error_pages))) {
+ err = ngx_array_push(lcf->error_pages);
+ if (err == NULL) {
return NGX_CONF_ERROR;
}
@@ -1981,7 +2005,8 @@
{
ngx_http_core_loc_conf_t *lcf = conf;
- if (!(lcf->err_log = ngx_log_create_errlog(cf->cycle, cf->args))) {
+ lcf->err_log = ngx_log_create_errlog(cf->cycle, cf->args);
+ if (lcf->err_log == NULL) {
return NGX_CONF_ERROR;
}
@@ -2021,5 +2046,5 @@
static ngx_int_t
ngx_http_core_init(ngx_cycle_t *cycle)
{
- return ngx_http_core_variables_init(cycle);
+ return ngx_http_variables_init(cycle);
}
