Mercurial > hg > nginx
comparison 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 |
comparison
equal
deleted
inserted
replaced
1508:bd5623467ad0 | 1509:d450e57ea5a4 |
---|---|
579 c->data = r; | 579 c->data = r; |
580 | 580 |
581 c->write->handler = ngx_http_upstream_send_request_handler; | 581 c->write->handler = ngx_http_upstream_send_request_handler; |
582 c->read->handler = ngx_http_upstream_process_header; | 582 c->read->handler = ngx_http_upstream_process_header; |
583 | 583 |
584 c->sendfile = r->connection->sendfile; | 584 c->sendfile &= r->connection->sendfile; |
585 | 585 |
586 c->pool = r->pool; | 586 c->pool = r->pool; |
587 c->read->log = c->write->log = c->log = r->connection->log; | 587 c->read->log = c->write->log = c->log = r->connection->log; |
588 | 588 |
589 /* init or reinit the ngx_output_chain() and ngx_chain_writer() contexts */ | 589 /* init or reinit the ngx_output_chain() and ngx_chain_writer() contexts */ |