Mercurial > hg > nginx
comparison src/http/ngx_http_upstream.c @ 6799:d8d037f20484
Upstream: handling of upstream SSL handshake timeouts.
Previously SSL handshake timeouts were not properly logged, and resulted
in 502 errors instead of 504 (ticket #1126).
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 14 Nov 2016 17:21:06 +0300 |
parents | 1a917932db96 |
children | c85dfd99a2dd |
comparison
equal
deleted
inserted
replaced
6798:2decd6b34306 | 6799:d8d037f20484 |
---|---|
1664 | 1664 |
1665 ngx_http_run_posted_requests(c); | 1665 ngx_http_run_posted_requests(c); |
1666 return; | 1666 return; |
1667 } | 1667 } |
1668 | 1668 |
1669 if (c->write->timedout) { | |
1670 c = r->connection; | |
1671 ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_TIMEOUT); | |
1672 ngx_http_run_posted_requests(c); | |
1673 return; | |
1674 } | |
1675 | |
1669 failed: | 1676 failed: |
1670 | 1677 |
1671 c = r->connection; | 1678 c = r->connection; |
1672 | 1679 |
1673 ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_ERROR); | 1680 ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_ERROR); |