Mercurial > hg > nginx

comparison src/http/ngx_http_core_module.c @ 2496:9081bbdccda1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
if_modified_since off
author Igor Sysoev <igor@sysoev.ru>
date Tue, 10 Feb 2009 15:05:05 +0000
parents d4fd929fb486
children 7b0711452b34
comparison
equal deleted inserted replaced
2495:a59b26eee816 2496:9081bbdccda1
110 { ngx_null_string, 0 } 110 { ngx_null_string, 0 }
111 }; 111 };
112 112
113 113
114 static ngx_conf_enum_t ngx_http_core_if_modified_since[] = { 114 static ngx_conf_enum_t ngx_http_core_if_modified_since[] = {
115 { ngx_string("exact"), 0 }, 115 { ngx_string("off"), NGX_HTTP_IMS_OFF },
116 { ngx_string("before"), 1 }, 116 { ngx_string("exact"), NGX_HTTP_IMS_EXACT },
117 { ngx_string("before"), NGX_HTTP_IMS_BEFORE },
117 { ngx_null_string, 0 } 118 { ngx_null_string, 0 }
118 }; 119 };
119 120
120 121
121 #if (NGX_HTTP_GZIP) 122 #if (NGX_HTTP_GZIP)
3050 prev->client_body_timeout, 60000); 3051 prev->client_body_timeout, 60000);
3051 3052
3052 ngx_conf_merge_uint_value(conf->satisfy, prev->satisfy, 3053 ngx_conf_merge_uint_value(conf->satisfy, prev->satisfy,
3053 NGX_HTTP_SATISFY_ALL); 3054 NGX_HTTP_SATISFY_ALL);
3054 ngx_conf_merge_uint_value(conf->if_modified_since, prev->if_modified_since, 3055 ngx_conf_merge_uint_value(conf->if_modified_since, prev->if_modified_since,
3055 0); 3056 NGX_HTTP_IMS_EXACT);
3056 ngx_conf_merge_value(conf->internal, prev->internal, 0); 3057 ngx_conf_merge_value(conf->internal, prev->internal, 0);
3057 ngx_conf_merge_value(conf->client_body_in_file_only, 3058 ngx_conf_merge_value(conf->client_body_in_file_only,
3058 prev->client_body_in_file_only, 0); 3059 prev->client_body_in_file_only, 0);
3059 ngx_conf_merge_value(conf->sendfile, prev->sendfile, 0); 3060 ngx_conf_merge_value(conf->sendfile, prev->sendfile, 0);
3060 ngx_conf_merge_size_value(conf->sendfile_max_chunk, 3061 ngx_conf_merge_size_value(conf->sendfile_max_chunk,