diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2006-07-07 16:33:19 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2006-07-07 16:33:19 +0000 |
| commit | 1765f475445a054994611d2053cc181fb3504615 (patch) | |
| tree | a816e7cada7b3bec35e866ee9b22f78bda6c5af8 /src/core/ngx_inet.c | |
| parent | b798d507122449c1baa85b1de47eec31cc0487a6 (diff) | |
| download | nginx-release-0.3.53.tar.gz nginx-release-0.3.53.zip | |
nginx-0.3.53-RELEASE importrelease-0.3.53
*) 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.
Diffstat (limited to 'src/core/ngx_inet.c')
| -rw-r--r-- | src/core/ngx_inet.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/core/ngx_inet.c b/src/core/ngx_inet.c index f2b0cf78b..7b3fef304 100644 --- a/src/core/ngx_inet.c +++ b/src/core/ngx_inet.c @@ -479,7 +479,6 @@ ngx_inet_resolve_peer(ngx_conf_t *cf, ngx_str_t *name, in_port_t port) } peers->number = i; - peers->weight = 1; for (i = 0; h->h_addr_list[i] != NULL; i++) { @@ -511,6 +510,10 @@ ngx_inet_resolve_peer(ngx_conf_t *cf, ngx_str_t *name, in_port_t port) - 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 @@ ngx_inet_upstream_parse(ngx_conf_t *cf, ngx_inet_upstream_t *u) } peers->number = i; - peers->weight = 1; for (i = 0; h->h_addr_list[i] != NULL; i++) { @@ -677,6 +679,10 @@ ngx_inet_upstream_parse(ngx_conf_t *cf, ngx_inet_upstream_t *u) 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 { |