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

HTTP: added "not_modified_check" directive.

Browse Source 
This directive establishes four distinct modes for managing 304 responses,
which determine how the If-None-Match and If-Modified-Since headers are
evaluated.

When the directive parameter is set to off, the response is always treated as
modified, regardless of the headers.

When set to any, a 304 response is returned if either the If-Modified-Since
or If-None-Match condition is satisfied.

When set to strict, a 304 response is returned only if both the
If-Modified-Since and If-None-Match conditions are met.
This is the default setting and reflects the traditional behavior of NGINX.

When set to prefer_if_none_match, it will follow RFC 9110, Section 13.1.3.
In this mode, if the If-None-Match header is present, the If-Modified-Since
header is ignored.
This commit is contained in:
Hanada 2025-04-26 23:45:00 +08:00
parent adda704158
commit 977d853b47
3 changed files with 77 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/http/modules/ngx_http_not_modified_filter_module.c
View File

@ -54,6 +54,8 @@ static ngx_http_output_header_filter_pt ngx_http_next_header_filter;
static ngx_int_t
ngx_http_not_modified_header_filter(ngx_http_request_t *r)
{
ngx_http_core_loc_conf_t *clcf;
if (r->headers_out.status != NGX_HTTP_OK
|| r != r->main
|| r->disable_not_modified)
@ -77,19 +79,58 @@ ngx_http_not_modified_header_filter(ngx_http_request_t *r)
if (r->headers_in.if_modified_since || r->headers_in.if_none_match) {
if (r->headers_in.if_modified_since
&& ngx_http_test_if_modified(r))
{
clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
if (clcf->not_modified_check == NGX_HTTP_NMC_STRICT) {
if (r->headers_in.if_modified_since
&& ngx_http_test_if_modified(r))
{
return ngx_http_next_header_filter(r);
}
if (r->headers_in.if_none_match
&& !ngx_http_test_if_match(r, r->headers_in.if_none_match, 1))
{
return ngx_http_next_header_filter(r);
}
} else if (clcf->not_modified_check == NGX_HTTP_NMC_PREFER_INM) {
if (r->headers_in.if_none_match) {
if (ngx_http_test_if_match(r, r->headers_in.if_none_match, 1))
{
goto not_modified;
}
return ngx_http_next_header_filter(r);
}
if (r->headers_in.if_modified_since
&& ngx_http_test_if_modified(r))
{
return ngx_http_next_header_filter(r);
}
} else if (clcf->not_modified_check == NGX_HTTP_NMC_ANY) {
if (r->headers_in.if_modified_since
&& !ngx_http_test_if_modified(r))
{
goto not_modified;
}
if (r->headers_in.if_none_match
&& ngx_http_test_if_match(r, r->headers_in.if_none_match, 1))
{
goto not_modified;
}
return ngx_http_next_header_filter(r);
} else { /* NGX_HTTP_NMC_OFF */
return ngx_http_next_header_filter(r);
}
if (r->headers_in.if_none_match
&& !ngx_http_test_if_match(r, r->headers_in.if_none_match, 1))
{
return ngx_http_next_header_filter(r);
}
/* not modified */
not_modified:
r->headers_out.status = NGX_HTTP_NOT_MODIFIED;
r->headers_out.status_line.len = 0;

19
src/http/ngx_http_core_module.c
View File

@ -129,6 +129,15 @@ static ngx_conf_enum_t ngx_http_core_server_tokens[] = {
};
static ngx_conf_enum_t ngx_http_core_not_modified_check[] = {
{ ngx_string("off"), NGX_HTTP_NMC_OFF },
{ ngx_string("any"), NGX_HTTP_NMC_ANY },
{ ngx_string("strict"), NGX_HTTP_NMC_STRICT },
{ ngx_string("prefer_if_none_match"), NGX_HTTP_NMC_PREFER_INM },
{ ngx_null_string, 0 }
};
static ngx_conf_enum_t ngx_http_core_if_modified_since[] = {
{ ngx_string("off"), NGX_HTTP_IMS_OFF },
{ ngx_string("exact"), NGX_HTTP_IMS_EXACT },
@ -642,6 +651,13 @@ static ngx_command_t ngx_http_core_commands[] = {
offsetof(ngx_http_core_loc_conf_t, server_tokens),
&ngx_http_core_server_tokens },
{ ngx_string("not_modified_check"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
ngx_conf_set_enum_slot,
NGX_HTTP_LOC_CONF_OFFSET,
offsetof(ngx_http_core_loc_conf_t, not_modified_check),
&ngx_http_core_not_modified_check },
{ ngx_string("if_modified_since"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
ngx_conf_set_enum_slot,
@ -3592,6 +3608,7 @@ ngx_http_core_create_loc_conf(ngx_conf_t *cf)
clcf->client_body_timeout = NGX_CONF_UNSET_MSEC;
clcf->satisfy = NGX_CONF_UNSET_UINT;
clcf->auth_delay = NGX_CONF_UNSET_MSEC;
clcf->not_modified_check = NGX_CONF_UNSET_UINT;
clcf->if_modified_since = NGX_CONF_UNSET_UINT;
clcf->max_ranges = NGX_CONF_UNSET_UINT;
clcf->client_body_in_file_only = NGX_CONF_UNSET_UINT;
@ -3812,6 +3829,8 @@ ngx_http_core_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
ngx_conf_merge_uint_value(conf->satisfy, prev->satisfy,
NGX_HTTP_SATISFY_ALL);
ngx_conf_merge_msec_value(conf->auth_delay, prev->auth_delay, 0);
ngx_conf_merge_uint_value(conf->not_modified_check,
prev->not_modified_check, NGX_HTTP_NMC_STRICT);
ngx_conf_merge_uint_value(conf->if_modified_since, prev->if_modified_since,
NGX_HTTP_IMS_EXACT);
ngx_conf_merge_uint_value(conf->max_ranges, prev->max_ranges,

7
src/http/ngx_http_core_module.h
View File

@ -60,6 +60,12 @@ typedef struct ngx_thread_pool_s ngx_thread_pool_t;
#define NGX_HTTP_SERVER_TOKENS_BUILD 2
#define NGX_HTTP_NMC_OFF 0
#define NGX_HTTP_NMC_ANY 1
#define NGX_HTTP_NMC_STRICT 2
#define NGX_HTTP_NMC_PREFER_INM 3
typedef struct ngx_http_location_tree_node_s ngx_http_location_tree_node_t;
typedef struct ngx_http_core_loc_conf_s ngx_http_core_loc_conf_t;
@ -384,6 +390,7 @@ struct ngx_http_core_loc_conf_s {
ngx_uint_t keepalive_disable; /* keepalive_disable */
ngx_uint_t satisfy; /* satisfy */
ngx_uint_t lingering_close; /* lingering_close */
ngx_uint_t not_modified_check; /* not_modified_check */
ngx_uint_t if_modified_since; /* if_modified_since */
ngx_uint_t max_ranges; /* max_ranges */
ngx_uint_t client_body_in_file_only; /* client_body_in_file_only */