mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-08-06 14:56:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Upstream: replaced u->pipe->temp_file with p->temp_file.

Browse Source 
While here, redundant parentheses removed.  No functional changes.
This commit is contained in:
Maxim Dounin 2013-07-25 14:56:49 +04:00
parent e6122efbfe
commit eafe44ff79
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/http/ngx_http_upstream.c
View File

@ -2982,11 +2982,11 @@ ngx_http_upstream_process_request(ngx_http_request_t *r)
if (p->upstream_eof || p->upstream_done) { 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 if (u->headers_in.status_n == NGX_HTTP_OK
&& (u->headers_in.content_length_n == -1 && (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); ngx_http_upstream_store(r, u);
u->store = 0; u->store = 0;
@ -2999,11 +2999,11 @@ ngx_http_upstream_process_request(ngx_http_request_t *r)
if (u->cacheable) { if (u->cacheable) {
if (p->upstream_done) { 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) { } else if (p->upstream_eof) {
tf = u->pipe->temp_file; tf = p->temp_file;
if (u->headers_in.content_length_n == -1 if (u->headers_in.content_length_n == -1
|| u->headers_in.content_length_n || u->headers_in.content_length_n
@ -3016,7 +3016,7 @@ ngx_http_upstream_process_request(ngx_http_request_t *r)
} }
} else if (p->upstream_error) { } 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);
} }
} }