diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/nginx.h | 2 | ||||
| -rw-r--r-- | src/core/ngx_inet.c | 5 | ||||
| -rw-r--r-- | src/core/ngx_unix_domain.c | 7 |
3 files changed, 4 insertions, 10 deletions
diff --git a/src/core/nginx.h b/src/core/nginx.h index b36e94417..78e731967 100644 --- a/src/core/nginx.h +++ b/src/core/nginx.h @@ -8,7 +8,7 @@ #define _NGINX_H_INCLUDED_ -#define NGINX_VER "nginx/0.2.5" +#define NGINX_VER "nginx/0.2.6" #define NGINX_VAR "NGINX" #define NGX_OLDPID_EXT ".oldbin" 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); diff --git a/src/core/ngx_unix_domain.c b/src/core/ngx_unix_domain.c index 097d111c4..12ffaecdb 100644 --- a/src/core/ngx_unix_domain.c +++ b/src/core/ngx_unix_domain.c @@ -34,13 +34,6 @@ ngx_unix_upstream_parse(ngx_conf_t *cf, ngx_unix_domain_upstream_t *u) break; } } - - if (u->uri.len == 0) { - ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, - "the unix domain upstream \"%V\" has no URI", - &u->name); - return NULL; - } } if (len == 0) { |