Mercurial > hg > nginx-vendor-0-8

comparison src/http/ngx_http_upstream.c @ 102:f63280c59dd5 NGINX_0_2_5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.2.5 *) Change: the duplicate value of the ngx_http_geo_module variable now causes the warning and changes old value. *) Feature: the ngx_http_ssi_module supports the "set" command. *) Feature: the ngx_http_ssi_module supports the "file" parameter in the "include" command. *) Feature: the ngx_http_ssi_module supports the variable value substitutions in expressions of the "if" command.
author Igor Sysoev <http://sysoev.ru>
date Tue, 04 Oct 2005 00:00:00 +0400
parents 45945fa8b8ba
children 146eff53ab60
comparison
equal deleted inserted replaced
101:5bb09dde34e7 102:f63280c59dd5
493 return; 493 return;
494 } 494 }
495 } 495 }
496 496
497 if (r->request_body) { 497 if (r->request_body) {
498 if (r->request_body->temp_file && r->main == NULL) { 498 if (r->request_body->temp_file && r->main == r) {
499 499
500 /* 500 /*
501 * the r->request_body->buf can be reused for one request only, 501 * the r->request_body->buf can be reused for one request only,
502 * the subrequests should allocate their own temporay bufs 502 * the subrequests should allocate their own temporay bufs
503 */ 503 */
558 } 558 }
559 559
560 /* reinit the subrequest's ngx_output_chain() context */ 560 /* reinit the subrequest's ngx_output_chain() context */
561 561
562 if (r->request_body) { 562 if (r->request_body) {
563 if (r->request_body->temp_file && r->main && u->output.buf) { 563 if (r->request_body->temp_file && r->main != r && u->output.buf) {
564 564
565 u->output.free = ngx_alloc_chain_link(r->pool); 565 u->output.free = ngx_alloc_chain_link(r->pool);
566 if (u->output.free == NULL) { 566 if (u->output.free == NULL) {
567 return NGX_ERROR; 567 return NGX_ERROR;
568 } 568 }
1452 return; 1452 return;
1453 } 1453 }
1454 1454
1455 r->connection->log->action = "sending to client"; 1455 r->connection->log->action = "sending to client";
1456 1456
1457 if (rc == 0 && r->main == NULL) { 1457 if (rc == 0 && r->main == r) {
1458 rc = ngx_http_send_last(r); 1458 rc = ngx_http_send_last(r);
1459 } 1459 }
1460 1460
1461 ngx_http_finalize_request(r, rc); 1461 ngx_http_finalize_request(r, rc);
1462 } 1462 }