nginx-0.2.5-RELEASE importrelease-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.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index 834c30244..647d9d20a 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -495,7 +495,7 @@ ngx_http_upstream_connect(ngx_http_request_t *r, ngx_http_upstream_t *u)
     }
 
     if (r->request_body) {
-        if (r->request_body->temp_file && r->main == NULL) {
+        if (r->request_body->temp_file && r->main == r) {
 
             /*
              * the r->request_body->buf can be reused for one request only,
@@ -560,7 +560,7 @@ ngx_http_upstream_reinit(ngx_http_request_t *r, ngx_http_upstream_t *u)
     /* reinit the subrequest's ngx_output_chain() context */
 
     if (r->request_body) {
-        if (r->request_body->temp_file && r->main && u->output.buf) {
+        if (r->request_body->temp_file && r->main != r && u->output.buf) {
 
             u->output.free = ngx_alloc_chain_link(r->pool);
             if (u->output.free == NULL) {
@@ -1454,7 +1454,7 @@ ngx_http_upstream_finalize_request(ngx_http_request_t *r,
 
     r->connection->log->action = "sending to client";
 
-    if (rc == 0 && r->main == NULL) {
+    if (rc == 0 && r->main == r) {
         rc = ngx_http_send_last(r);
     }