details: http://hg.nginx.org/nginx/rev/a7b2db9119e0
branches:
changeset: 5298:a7b2db9119e0
user: Maxim Dounin <mdounin@mdounin.ru>
date: Thu Jul 25 14:56:49 2013 +0400
description:
Upstream: replaced u->pipe->temp_file with p->temp_file.

While here, redundant parentheses removed. No functional changes.

diffstat:

src/http/ngx_http_upstream.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)

diffs (40 lines):

diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -2982,11 +2982,11 @@ ngx_http_upstream_process_request(ngx_ht

if (p->upstream_eof || p->upstream_done) {

- tf = u->pipe->temp_file;
+ tf = p->temp_file;

if (u->headers_in.status_n == NGX_HTTP_OK
&& (u->headers_in.content_length_n == -1
- || (u->headers_in.content_length_n == tf->offset)))
+ || u->headers_in.content_length_n == tf->offset))
{
ngx_http_upstream_store(r, u);
u->store = 0;
@@ -2999,11 +2999,11 @@ ngx_http_upstream_process_request(ngx_ht
if (u->cacheable) {

if (p->upstream_done) {
- ngx_http_file_cache_update(r, u->pipe->temp_file);
+ ngx_http_file_cache_update(r, p->temp_file);

} else if (p->upstream_eof) {

- tf = u->pipe->temp_file;
+ tf = p->temp_file;

if (u->headers_in.content_length_n == -1
|| u->headers_in.content_length_n
@@ -3016,7 +3016,7 @@ ngx_http_upstream_process_request(ngx_ht
}

} else if (p->upstream_error) {
- ngx_http_file_cache_free(r->cache, u->pipe->temp_file);
+ ngx_http_file_cache_free(r->cache, p->temp_file);
}
}


_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel