nginx-0.3.53-RELEASE import
*) Change: the "add_header" directive adds the string to 204, 301, and
302 responses.
*) Feature: the "server" directive in the "upstream" context supports
the "weight" parameter.
*) Feature: the "server_name" directive supports the "*" wildcard.
*) Feature: nginx supports the request body size more than 2G.
*) Bugfix: if a client was successfully authorized using "satisfy_any
on", then anyway the message "access forbidden by rule" was written
in the log.
*) Bugfix: the "PUT" method may erroneously not create a file and
return the 409 code.
*) Bugfix: if the IMAP/POP3 backend returned an error, then nginx
continued proxying anyway.
diff --git a/src/core/ngx_inet.c b/src/core/ngx_inet.c
index f2b0cf7..7b3fef3 100644
--- a/src/core/ngx_inet.c
+++ b/src/core/ngx_inet.c
@@ -479,7 +479,6 @@
}
peers->number = i;
- peers->weight = 1;
for (i = 0; h->h_addr_list[i] != NULL; i++) {
@@ -511,6 +510,10 @@
- peers->peer[i].name.data;
peers->peer[i].uri_separator = "";
+
+ peers->peer[i].weight = NGX_CONF_UNSET_UINT;
+ peers->peer[i].max_fails = NGX_CONF_UNSET_UINT;
+ peers->peer[i].fail_timeout = NGX_CONF_UNSET;
}
} else {
@@ -643,7 +646,6 @@
}
peers->number = i;
- peers->weight = 1;
for (i = 0; h->h_addr_list[i] != NULL; i++) {
@@ -677,6 +679,10 @@
peers->peer[i].name.len = len + u->port_text.len;
peers->peer[i].uri_separator = "";
+
+ peers->peer[i].weight = NGX_CONF_UNSET_UINT;
+ peers->peer[i].max_fails = NGX_CONF_UNSET_UINT;
+ peers->peer[i].fail_timeout = NGX_CONF_UNSET;
}
} else {
