Klaus Demo nginx / 69fc41c
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
1 changed file(s) with 12 addition(s) and 0 deletion(s). Raw diff Collapse all Expand all
20072007 return;
20082008 }
20092009
2010 if (c->write->ready && c->tcp_nopush == NGX_TCP_NOPUSH_SET) {
2011 if (ngx_tcp_push(c->fd) == -1) {
2012 ngx_log_error(NGX_LOG_CRIT, c->log, ngx_socket_errno,
2013 ngx_tcp_push_n " failed");
2014 ngx_http_upstream_finalize_request(r, u,
2015 NGX_HTTP_INTERNAL_SERVER_ERROR);
2016 return;
2017 }
2018
2019 c->tcp_nopush = NGX_TCP_NOPUSH_UNSET;
2020 }
2021
20102022 return;
20112023 }
20122024