Mercurial > hg > nginx-quic
changeset 1509:d450e57ea5a4 stable-0.5
r1398 merge:
upstream sendfile bit was overridden by r->connection->sendfile
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Sat, 22 Sep 2007 19:08:42 +0000 |
parents | bd5623467ad0 |
children | 2abedb6c0f29 |
files | src/event/ngx_event_connect.c src/http/ngx_http_upstream.c |
diffstat | 2 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/event/ngx_event_connect.c +++ b/src/event/ngx_event_connect.c @@ -85,6 +85,8 @@ ngx_event_connect_peer(ngx_peer_connecti 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) {
--- a/src/http/ngx_http_upstream.c +++ b/src/http/ngx_http_upstream.c @@ -581,7 +581,7 @@ ngx_http_upstream_connect(ngx_http_reque 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;