diff src/http/ngx_http_upstream.c @ 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 840b81d13a2f
children 95e76183ec4f
line wrap: on
line diff
--- 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;