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

This commit is contained in:
Igor Sysoev 2007-08-14 20:44:09 +00:00
parent 5cf4d1af4e
commit e101338634
2 changed files with 3 additions and 1 deletions

View File

@ -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) {

View File

@ -583,7 +583,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;