diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2013-07-25 14:56:49 +0400 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2013-07-25 14:56:49 +0400 |
| commit | eafe44ff7995ab32c7935495ce0905530a104ec9 (patch) | |
| tree | 2c52857ff171421e0c8a194a4e06131bcdf338f3 /src | |
| parent | e6122efbfe50fbd7724a940f4433948c2612a397 (diff) | |
| download | nginx-eafe44ff7995ab32c7935495ce0905530a104ec9.tar.gz nginx-eafe44ff7995ab32c7935495ce0905530a104ec9.tar.bz2 | |
Upstream: replaced u->pipe->temp_file with p->temp_file.
While here, redundant parentheses removed. No functional changes.
Diffstat (limited to 'src')
| -rw-r--r-- | src/http/ngx_http_upstream.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c index 32455bcd9..210f3bbc1 100644 --- a/src/http/ngx_http_upstream.c +++ b/src/http/ngx_http_upstream.c @@ -2982,11 +2982,11 @@ ngx_http_upstream_process_request(ngx_http_request_t *r) 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_http_request_t *r) 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_http_request_t *r) } } 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); } } |