# HG changeset patch
# User Maxim Dounin <mdounin@mdounin.ru>
# Date 1530547351 -10800
# Node ID 8eab05b83dde2d5d4bf845314e5552c1ed9ada72
# Parent  6cfd45d4c754c86c090f0c5b5bfdd1363bb975da
Upstream: fixed unexpected tcp_nopush usage on peer connections.

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.

diff -r 6cfd45d4c754 -r 8eab05b83dde src/http/ngx_http_upstream.c
--- a/src/http/ngx_http_upstream.c	Mon Jul 02 19:02:08 2018 +0300
+++ b/src/http/ngx_http_upstream.c	Mon Jul 02 19:02:31 2018 +0300
@@ -1556,6 +1556,10 @@
     c->sendfile &= r->connection->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) {
 
         /* we need separate pool here to be able to cache SSL connections */