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

Upstream: unconditional parsing of last_modified_time.

Browse Source 
This fixes at least the following cases, where no last_modified_time
(assuming caching is not enabled) resulted in incorrect behaviour:

- slice filter and If-Range requests (ticket #1357);
- If-Range requests with proxy_force_ranges;
- expires modified.
This commit is contained in:
Maxim Dounin 2017-08-23 19:20:06 +03:00
parent ed0cc4d523
commit 6a2e409833
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/http/ngx_http_upstream.c
View File

@ -4390,15 +4390,8 @@ ngx_http_upstream_process_last_modified(ngx_http_request_t *r,
u = r->upstream; u = r->upstream;
u->headers_in.last_modified = h; u->headers_in.last_modified = h;
u->headers_in.last_modified_time = ngx_parse_http_time(h->value.data,
#if (NGX_HTTP_CACHE) h->value.len);
if (u->cacheable) {
u->headers_in.last_modified_time = ngx_parse_http_time(h->value.data,
h->value.len);
}
#endif
return NGX_OK; return NGX_OK;
} }
@ -4940,15 +4933,8 @@ ngx_http_upstream_copy_last_modified(ngx_http_request_t *r, ngx_table_elt_t *h,
*ho = *h; *ho = *h;
r->headers_out.last_modified = ho; r->headers_out.last_modified = ho;
r->headers_out.last_modified_time =
#if (NGX_HTTP_CACHE)
if (r->upstream->cacheable) {
r->headers_out.last_modified_time =
r->upstream->headers_in.last_modified_time; r->upstream->headers_in.last_modified_time;
}
#endif
return NGX_OK; return NGX_OK;
} }