diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2007-09-22 19:08:42 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2007-09-22 19:08:42 +0000 |
| commit | 2c7cb74b9feb4b5337b374e5873f64f930a4960c (patch) | |
| tree | f156762cb032c42bcac930a009fd5f3cdcd68eb6 | |
| parent | 6883bc72c524ff9100bc9f37ad12e44356b9a929 (diff) | |
| download | nginx-2c7cb74b9feb4b5337b374e5873f64f930a4960c.tar.gz nginx-2c7cb74b9feb4b5337b374e5873f64f930a4960c.tar.bz2 | |
r1398 merge:
upstream sendfile bit was overridden by r->connection->sendfile
| -rw-r--r-- | src/event/ngx_event_connect.c | 2 | ||||
| -rw-r--r-- | src/http/ngx_http_upstream.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/event/ngx_event_connect.c b/src/event/ngx_event_connect.c index fae9c8c86..a2042c7c9 100644 --- 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 bc4567458..2140d855d 100644 --- 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; |