From a257367813cc604e9a8012cb64936a96b3a169cc Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Wed, 5 Oct 2005 14:46:21 +0000 Subject: nginx-0.2.6-RELEASE import *) Change: while using load-balancing the time before the failed backend retry was decreased from 60 to 10 seconds. *) Change: the "proxy_pass_unparsed_uri" was canceled, the original URI now passed, if the URI part is omitted in "proxy_pass" directive. *) Feature: the "error_page" directive supports redirects and allows more flexible to change an error code. *) Change: the charset in the "Content-Type" header line now is ignored in proxied subrequests. *) Bugfix: if the URI was changed in the "if" block and request did not found new configuration, then the ngx_http_rewrite_module rules ran again. *) Bugfix: if the "set" directive set the ngx_http_geo_module variable in some configuration part, the this variable was not available in other configuration parts and the "using uninitialized variable" error was occurred; the bug had appeared in 0.2.2. --- src/core/ngx_inet.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/core/ngx_inet.c') diff --git a/src/core/ngx_inet.c b/src/core/ngx_inet.c index 7b2d8d6b8..376aaaefa 100644 --- a/src/core/ngx_inet.c +++ b/src/core/ngx_inet.c @@ -346,7 +346,7 @@ ngx_inet_upstream_parse(ngx_conf_t *cf, ngx_inet_upstream_t *u) peers->peer[i].weight = 1; peers->peer[i].max_fails = 1; - peers->peer[i].fail_timeout = 60; + peers->peer[i].fail_timeout = 10; } } else { @@ -471,7 +471,8 @@ ngx_inet_parse_host_port(ngx_inet_upstream_t *u) } else { if (u->port_text.len == 0) { - return "no URI"; + u->default_port = 1; + return NULL; } port = ngx_atoi(u->port_text.data, u->port_text.len); -- cgit