Mercurial > hg > nginx
comparison src/http/ngx_http_upstream.c @ 7307:ece9b5454b8a
Upstream: fixed tcp_nopush with gRPC.
With gRPC it is possible that a request sending is blocked due to flow
control. Moreover, further sending might be only allowed once the
backend sees all the data we've already sent. With such a backend
it is required to clear the TCP_NOPUSH socket option to make sure all
the data we've sent are actually delivered to the backend.
As such, we now clear TCP_NOPUSH in ngx_http_upstream_send_request()
also on NGX_AGAIN if c->write->ready is set. This fixes a test (which
waits for all the 64k bytes as per initial window before allowing more
bytes) with sendfile enabled when the body was written to a file
in a different context.
| author | Maxim Dounin <mdounin@mdounin.ru> |
|---|---|
| date | Mon, 02 Jul 2018 19:03:04 +0300 |
| parents | 8eab05b83dde |
| children | 696df3ac27ac |
comparison
equal
deleted
inserted
replaced
| 7306:8eab05b83dde | 7307:ece9b5454b8a |
|---|---|
| 2010 ngx_http_upstream_finalize_request(r, u, | 2010 ngx_http_upstream_finalize_request(r, u, |
| 2011 NGX_HTTP_INTERNAL_SERVER_ERROR); | 2011 NGX_HTTP_INTERNAL_SERVER_ERROR); |
| 2012 return; | 2012 return; |
| 2013 } | 2013 } |
| 2014 | 2014 |
| 2015 if (c->write->ready && c->tcp_nopush == NGX_TCP_NOPUSH_SET) { | |
| 2016 if (ngx_tcp_push(c->fd) == -1) { | |
| 2017 ngx_log_error(NGX_LOG_CRIT, c->log, ngx_socket_errno, | |
| 2018 ngx_tcp_push_n " failed"); | |
| 2019 ngx_http_upstream_finalize_request(r, u, | |
| 2020 NGX_HTTP_INTERNAL_SERVER_ERROR); | |
| 2021 return; | |
| 2022 } | |
| 2023 | |
| 2024 c->tcp_nopush = NGX_TCP_NOPUSH_UNSET; | |
| 2025 } | |
| 2026 | |
| 2015 return; | 2027 return; |
| 2016 } | 2028 } |
| 2017 | 2029 |
| 2018 /* rc == NGX_OK */ | 2030 /* rc == NGX_OK */ |
| 2019 | 2031 |