comparison proxy_next_upstream_tries.t @ 814:b6b407fd5c12

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.
author Sergey Kandaurov <pluknet@nginx.com>
date Mon, 21 Dec 2015 14:51:15 +0300
parents a6764c2a9f12
children b1fa8e0cc27b
comparison
equal deleted inserted replaced
813:43716ff7f8f5 814:b6b407fd5c12
67 proxy_next_upstream_tries 2; 67 proxy_next_upstream_tries 2;
68 } 68 }
69 69
70 location /tries/resolver { 70 location /tries/resolver {
71 resolver 127.0.0.1:8083; 71 resolver 127.0.0.1:8083;
72 resolver_timeout 1s;
73 72
74 proxy_pass http://$host:8081; 73 proxy_pass http://$host:8081;
75 proxy_next_upstream_tries 2; 74 proxy_next_upstream_tries 2;
76 } 75 }
77 76
90 proxy_next_upstream_timeout 3800ms; 89 proxy_next_upstream_timeout 3800ms;
91 } 90 }
92 91
93 location /timeout/resolver { 92 location /timeout/resolver {
94 resolver 127.0.0.1:8083; 93 resolver 127.0.0.1:8083;
95 resolver_timeout 1s;
96 94
97 proxy_pass http://$host:8081/w2; 95 proxy_pass http://$host:8081/w2;
98 proxy_next_upstream_timeout 3800ms; 96 proxy_next_upstream_timeout 3800ms;
99 } 97 }
100 98