r1398 merge:

upstream sendfile bit was overridden by r->connection->sendfile

diff --git a/src/event/ngx_event_connect.c b/src/event/ngx_event_connect.c
index fae9c8c86b11f1f103e0333e42e785f0dad6e585..a2042c7c99ff588e83ef3871e999992e36a9528f 100644 (file)
--- a/src/event/ngx_event_connect.c
+++ b/src/event/ngx_event_connect.c
@@ -85,6 +85,8 @@ ngx_event_connect_peer(ngx_peer_connection_t *pc)
     c->recv_chain = ngx_recv_chain;
     c->send_chain = ngx_send_chain;
 
+    c->sendfile = 1;
+
     c->log_error = pc->log_error;
 
     if (pc->sockaddr->sa_family != AF_INET) {

diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index bc4567458dd679e80b82714e9590437ac628642b..2140d855d5a8a590cc6f6252c24f679d65d8afa6 100644 (file)
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -581,7 +581,7 @@ ngx_http_upstream_connect(ngx_http_request_t *r, ngx_http_upstream_t *u)
     c->write->handler = ngx_http_upstream_send_request_handler;
     c->read->handler = ngx_http_upstream_process_header;
 
-    c->sendfile = r->connection->sendfile;
+    c->sendfile &= r->connection->sendfile;
 
     c->pool = r->pool;
     c->read->log = c->write->log = c->log = r->connection->log;