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/core/ngx_inet.c b/src/core/ngx_inet.c
index a30ff03..6cad053 100644
--- a/src/core/ngx_inet.c
+++ b/src/core/ngx_inet.c
@@ -244,7 +244,8 @@
u->port = u->default_port_value;
- if (!(u->port_text.data = ngx_palloc(cf->pool, sizeof("65536") - 1))) {
+ u->port_text.data = ngx_palloc(cf->pool, sizeof("65536") - 1);
+ if (u->port_text.data == NULL) {
return NULL;
}
@@ -271,7 +272,8 @@
u->port = htons(u->port);
- if (!(host = ngx_palloc(cf->pool, u->host.len + 1))) {
+ host = ngx_palloc(cf->pool, u->host.len + 1);
+ if (host == NULL) {
return NULL;
}
@@ -297,7 +299,6 @@
peers = ngx_pcalloc(cf->pool,
sizeof(ngx_peers_t) + sizeof(ngx_peer_t) * (i - 1));
-
if (peers == NULL) {
return NULL;
}
@@ -307,7 +308,8 @@
for (i = 0; h->h_addr_list[i] != NULL; i++) {
- if (!(sin = ngx_pcalloc(cf->pool, sizeof(struct sockaddr_in)))) {
+ sin = ngx_pcalloc(cf->pool, sizeof(struct sockaddr_in));
+ if (sin == NULL) {
return NULL;
}
@@ -320,7 +322,8 @@
len = INET_ADDRSTRLEN - 1 + 1 + u->port_text.len;
- if (!(peers->peer[i].name.data = ngx_palloc(cf->pool, len))) {
+ peers->peer[i].name.data = ngx_palloc(cf->pool, len);
+ if (peers->peer[i].name.data == NULL) {
return NULL;
}
@@ -345,11 +348,13 @@
/* MP: ngx_shared_palloc() */
- if (!(peers = ngx_pcalloc(cf->pool, sizeof(ngx_peers_t)))) {
+ peers = ngx_pcalloc(cf->pool, sizeof(ngx_peers_t));
+ if (peers == NULL) {
return NULL;
}
- if (!(sin = ngx_pcalloc(cf->pool, sizeof(struct sockaddr_in)))) {
+ sin = ngx_pcalloc(cf->pool, sizeof(struct sockaddr_in));
+ if (sin == NULL) {
return NULL;
}
@@ -366,7 +371,8 @@
peers->peer[0].name.len = len;
- if (!(peers->peer[0].name.data = ngx_palloc(cf->pool, len))) {
+ peers->peer[0].name.data = ngx_palloc(cf->pool, len);
+ if (peers->peer[0].name.data == NULL) {
return NULL;
}