# HG changeset patch # User Sergey Kandaurov # Date 1450698675 -10800 # Node ID b6b407fd5c12534788a0295badcfaf069d89f2d7 # Parent 43716ff7f8f58dd204d6b1aaf4b0729eccb67261 Tests: removed resolver_timeout from proxy_next_upstream_tries.t. The directive isn't needed there and is only used to break tests on occasion. diff --git a/proxy_next_upstream_tries.t b/proxy_next_upstream_tries.t --- a/proxy_next_upstream_tries.t +++ b/proxy_next_upstream_tries.t @@ -69,7 +69,6 @@ http { location /tries/resolver { resolver 127.0.0.1:8083; - resolver_timeout 1s; proxy_pass http://$host:8081; proxy_next_upstream_tries 2; @@ -92,7 +91,6 @@ http { location /timeout/resolver { resolver 127.0.0.1:8083; - resolver_timeout 1s; proxy_pass http://$host:8081/w2; proxy_next_upstream_timeout 3800ms;