diff options
author | Igor Sysoev <igor@sysoev.ru> | 2009-02-10 15:05:05 +0000 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2009-02-10 15:05:05 +0000 |
commit | 2c33648e52a6f355b426e617dd3fc577961c5193 (patch) | |
tree | 5ded7f244233d44be18fb0e82475a8dffb9a11fa /src/http/ngx_http_core_module.c | |
parent | 09f6cd5fa930eb22ace086ecb71571ffb5071080 (diff) | |
download | nginx-2c33648e52a6f355b426e617dd3fc577961c5193.tar.gz nginx-2c33648e52a6f355b426e617dd3fc577961c5193.zip |
if_modified_since off
Diffstat (limited to 'src/http/ngx_http_core_module.c')
-rw-r--r-- | src/http/ngx_http_core_module.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c index 9890fbb92..a21da0f3b 100644 --- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@ -112,8 +112,9 @@ static ngx_conf_enum_t ngx_http_core_satisfy[] = { static ngx_conf_enum_t ngx_http_core_if_modified_since[] = { - { ngx_string("exact"), 0 }, - { ngx_string("before"), 1 }, + { ngx_string("off"), NGX_HTTP_IMS_OFF }, + { ngx_string("exact"), NGX_HTTP_IMS_EXACT }, + { ngx_string("before"), NGX_HTTP_IMS_BEFORE }, { 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_HTTP_SATISFY_ALL); 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->client_body_in_file_only, prev->client_body_in_file_only, 0); |