mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-12 10:19:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

if_modified_since off

Browse Source
This commit is contained in:
Igor Sysoev 2009-02-10 15:05:05 +00:00
parent 09f6cd5fa9
commit 2c33648e52
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,6 +61,12 @@ ngx_int_t ngx_http_not_modified_header_filter(ngx_http_request_t *r)
return ngx_http_next_header_filter(r); return ngx_http_next_header_filter(r);
} }
clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
if (clcf->if_modified_since == NGX_HTTP_IMS_OFF) {
return ngx_http_next_header_filter(r);
}
ims = ngx_http_parse_time(r->headers_in.if_modified_since->value.data, ims = ngx_http_parse_time(r->headers_in.if_modified_since->value.data,
r->headers_in.if_modified_since->value.len); r->headers_in.if_modified_since->value.len);
@ -69,9 +75,7 @@ ngx_int_t ngx_http_not_modified_header_filter(ngx_http_request_t *r)
if (ims != r->headers_out.last_modified_time) { if (ims != r->headers_out.last_modified_time) {
clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); if (clcf->if_modified_since == NGX_HTTP_IMS_EXACT
if (clcf->if_modified_since == 0
|| ims < r->headers_out.last_modified_time) || ims < r->headers_out.last_modified_time)
{ {
return ngx_http_next_header_filter(r); return ngx_http_next_header_filter(r);

7
src/http/ngx_http_core_module.c
View File

@ -112,8 +112,9 @@ static ngx_conf_enum_t ngx_http_core_satisfy[] = {
static ngx_conf_enum_t ngx_http_core_if_modified_since[] = { static ngx_conf_enum_t ngx_http_core_if_modified_since[] = {
{ ngx_string("exact"), 0 }, { ngx_string("off"), NGX_HTTP_IMS_OFF },
{ ngx_string("before"), 1 }, { ngx_string("exact"), NGX_HTTP_IMS_EXACT },
{ ngx_string("before"), NGX_HTTP_IMS_BEFORE },
{ ngx_null_string, 0 } { ngx_null_string, 0 }
}; };
@ -3052,7 +3053,7 @@ ngx_http_core_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
ngx_conf_merge_uint_value(conf->satisfy, prev->satisfy, ngx_conf_merge_uint_value(conf->satisfy, prev->satisfy,
NGX_HTTP_SATISFY_ALL); NGX_HTTP_SATISFY_ALL);
ngx_conf_merge_uint_value(conf->if_modified_since, prev->if_modified_since, ngx_conf_merge_uint_value(conf->if_modified_since, prev->if_modified_since,
0); NGX_HTTP_IMS_EXACT);
ngx_conf_merge_value(conf->internal, prev->internal, 0); ngx_conf_merge_value(conf->internal, prev->internal, 0);
ngx_conf_merge_value(conf->client_body_in_file_only, ngx_conf_merge_value(conf->client_body_in_file_only,
prev->client_body_in_file_only, 0); prev->client_body_in_file_only, 0);

5
src/http/ngx_http_core_module.h
View File

@ -28,6 +28,11 @@
#define NGX_HTTP_SATISFY_ANY 1 #define NGX_HTTP_SATISFY_ANY 1
#define NGX_HTTP_IMS_OFF 0
#define NGX_HTTP_IMS_EXACT 1
#define NGX_HTTP_IMS_BEFORE 2
typedef struct ngx_http_location_tree_node_s ngx_http_location_tree_node_t; 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; typedef struct ngx_http_core_loc_conf_s ngx_http_core_loc_conf_t;