Mercurial > hg > nginx
comparison src/http/ngx_http_upstream.c @ 7411:abe1b60c4213 stable-1.14
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 | 17ee239ae2e6 |
| children |
comparison
equal
deleted
inserted
replaced
| 7410:9ac0e8b9aced | 7411:abe1b60c4213 |
|---|---|
| 2006 ngx_http_upstream_finalize_request(r, u, | 2006 ngx_http_upstream_finalize_request(r, u, |
| 2007 NGX_HTTP_INTERNAL_SERVER_ERROR); | 2007 NGX_HTTP_INTERNAL_SERVER_ERROR); |
| 2008 return; | 2008 return; |
| 2009 } | 2009 } |
| 2010 | 2010 |
| 2011 if (c->write->ready && c->tcp_nopush == NGX_TCP_NOPUSH_SET) { | |
| 2012 if (ngx_tcp_push(c->fd) == -1) { | |
| 2013 ngx_log_error(NGX_LOG_CRIT, c->log, ngx_socket_errno, | |
| 2014 ngx_tcp_push_n " failed"); | |
| 2015 ngx_http_upstream_finalize_request(r, u, | |
| 2016 NGX_HTTP_INTERNAL_SERVER_ERROR); | |
| 2017 return; | |
| 2018 } | |
| 2019 | |
| 2020 c->tcp_nopush = NGX_TCP_NOPUSH_UNSET; | |
| 2021 } | |
| 2022 | |
| 2011 return; | 2023 return; |
| 2012 } | 2024 } |
| 2013 | 2025 |
| 2014 /* rc == NGX_OK */ | 2026 /* rc == NGX_OK */ |
| 2015 | 2027 |