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.
Maxim Dounin
3 years ago
| 2011 | 2011 | return; |
| 2012 | 2012 | } |
| 2013 | 2013 | |
| 2014 | if (c->write->ready && c->tcp_nopush == NGX_TCP_NOPUSH_SET) { | |
| 2015 | if (ngx_tcp_push(c->fd) == -1) { | |
| 2016 | ngx_log_error(NGX_LOG_CRIT, c->log, ngx_socket_errno, | |
| 2017 | ngx_tcp_push_n " failed"); | |
| 2018 | ngx_http_upstream_finalize_request(r, u, | |
| 2019 | NGX_HTTP_INTERNAL_SERVER_ERROR); | |
| 2020 | return; | |
| 2021 | } | |
| 2022 | ||
| 2023 | c->tcp_nopush = NGX_TCP_NOPUSH_UNSET; | |
| 2024 | } | |
| 2025 | ||
| 2014 | 2026 | return; |
| 2015 | 2027 | } |
| 2016 | 2028 |