Mercurial > hg > nginx
comparison src/http/ngx_http_upstream.h @ 8041:0784ab86ad08
Upstream: fixed X-Accel-Expires/Cache-Control/Expires handling.
Previously, if caching was disabled due to Expires in the past, nginx
failed to cache the response even if it was cacheable as per subsequently
parsed Cache-Control header (ticket #964).
Similarly, if caching was disabled due to Expires in the past,
"Cache-Control: no-cache" or "Cache-Control: max-age=0", caching was not
used if it was cacheable as per subsequently parsed X-Accel-Expires header.
Fix is to avoid disabling caching immediately after parsing Expires in
the past or Cache-Control, but rather set flags which are later checked by
ngx_http_upstream_process_headers() (and cleared by "Cache-Control: max-age"
and X-Accel-Expires).
Additionally, now X-Accel-Expires does not prevent parsing of cache control
extensions, notably stale-while-revalidate and stale-if-error. This
ensures that order of the X-Accel-Expires and Cache-Control headers is not
important.
Prodded by Vadim Fedorenko and Yugo Horie.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Tue, 07 Jun 2022 00:07:12 +0300 |
parents | 413dbda22f7d |
children | 8cdab3d89c44 |
comparison
equal
deleted
inserted
replaced
8040:e0cfab501dd1 | 8041:0784ab86ad08 |
---|---|
291 off_t content_length_n; | 291 off_t content_length_n; |
292 time_t last_modified_time; | 292 time_t last_modified_time; |
293 | 293 |
294 unsigned connection_close:1; | 294 unsigned connection_close:1; |
295 unsigned chunked:1; | 295 unsigned chunked:1; |
296 unsigned no_cache:1; | |
297 unsigned expired:1; | |
296 } ngx_http_upstream_headers_in_t; | 298 } ngx_http_upstream_headers_in_t; |
297 | 299 |
298 | 300 |
299 typedef struct { | 301 typedef struct { |
300 ngx_str_t host; | 302 ngx_str_t host; |