IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-23 15:40:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

Upstream: fixed unexpected tcp_nopush usage on peer connections.

Browse Source 
Now tcp_nopush on peer connections is disabled if it is disabled on
the client connection, similar to how we handle c->sendfile.  Previously,
tcp_nopush was always used on upstream connections, regardless of
the "tcp_nopush" directive.
This commit is contained in:
Maxim Dounin 2018-07-02 19:02:31 +03:00
parent d842b4e5e0
commit 1331a99f5c
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/http/ngx_http_upstream.c
View File

@ -1556,6 +1556,10 @@ ngx_http_upstream_connect(ngx_http_request_t *r, ngx_http_upstream_t *u)
c->sendfile &= r->connection->sendfile; c->sendfile &= r->connection->sendfile;
u->output.sendfile = c->sendfile; u->output.sendfile = c->sendfile;
if (r->connection->tcp_nopush == NGX_TCP_NOPUSH_DISABLED) {
c->tcp_nopush = NGX_TCP_NOPUSH_DISABLED;
}
if (c->pool == NULL) { if (c->pool == NULL) {
/* we need separate pool here to be able to cache SSL connections */ /* we need separate pool here to be able to cache SSL connections */