Mercurial > hg > nginx

comparison src/http/modules/ngx_http_scgi_module.c @ 5441:43ccaf8e8728

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Upstream: cache revalidation with conditional requests. The following new directives are introduced: proxy_cache_revalidate, fastcgi_cache_revalidate, scgi_cache_revalidate, uwsgi_cache_revalidate. Default is off. When set to on, they enable cache revalidation using conditional requests with If-Modified-Since for expired cache items. As of now, no attempts are made to merge headers given in a 304 response during cache revalidation with headers previously stored in a cache item. Headers in a 304 response are only used to calculate new validity time of a cache item.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 18 Nov 2013 20:48:22 +0400
parents 1a070e89b97a
children e68af4e3396f
comparison
equal deleted inserted replaced
5440:cbb9a6c7493c 5441:43ccaf8e8728
258 { ngx_string("scgi_cache_lock_timeout"), 258 { ngx_string("scgi_cache_lock_timeout"),
259 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, 259 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
260 ngx_conf_set_msec_slot, 260 ngx_conf_set_msec_slot,
261 NGX_HTTP_LOC_CONF_OFFSET, 261 NGX_HTTP_LOC_CONF_OFFSET,
262 offsetof(ngx_http_scgi_loc_conf_t, upstream.cache_lock_timeout), 262 offsetof(ngx_http_scgi_loc_conf_t, upstream.cache_lock_timeout),
263 NULL },
264
265 { ngx_string("scgi_cache_revalidate"),
266 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
267 ngx_conf_set_flag_slot,
268 NGX_HTTP_LOC_CONF_OFFSET,
269 offsetof(ngx_http_scgi_loc_conf_t, upstream.cache_revalidate),
263 NULL }, 270 NULL },
264 271
265 #endif 272 #endif
266 273
267 { ngx_string("scgi_temp_path"), 274 { ngx_string("scgi_temp_path"),
367 374
368 375
369 #if (NGX_HTTP_CACHE) 376 #if (NGX_HTTP_CACHE)
370 377
371 static ngx_keyval_t ngx_http_scgi_cache_headers[] = { 378 static ngx_keyval_t ngx_http_scgi_cache_headers[] = {
372 { ngx_string("HTTP_IF_MODIFIED_SINCE"), ngx_string("") }, 379 { ngx_string("HTTP_IF_MODIFIED_SINCE"),
380 ngx_string("$upstream_cache_last_modified") },
373 { ngx_string("HTTP_IF_UNMODIFIED_SINCE"), ngx_string("") }, 381 { ngx_string("HTTP_IF_UNMODIFIED_SINCE"), ngx_string("") },
374 { ngx_string("HTTP_IF_NONE_MATCH"), ngx_string("") }, 382 { ngx_string("HTTP_IF_NONE_MATCH"), ngx_string("") },
375 { ngx_string("HTTP_IF_MATCH"), ngx_string("") }, 383 { ngx_string("HTTP_IF_MATCH"), ngx_string("") },
376 { ngx_string("HTTP_RANGE"), ngx_string("") }, 384 { ngx_string("HTTP_RANGE"), ngx_string("") },
377 { ngx_string("HTTP_IF_RANGE"), ngx_string("") }, 385 { ngx_string("HTTP_IF_RANGE"), ngx_string("") },
1091 conf->upstream.cache_bypass = NGX_CONF_UNSET_PTR; 1099 conf->upstream.cache_bypass = NGX_CONF_UNSET_PTR;
1092 conf->upstream.no_cache = NGX_CONF_UNSET_PTR; 1100 conf->upstream.no_cache = NGX_CONF_UNSET_PTR;
1093 conf->upstream.cache_valid = NGX_CONF_UNSET_PTR; 1101 conf->upstream.cache_valid = NGX_CONF_UNSET_PTR;
1094 conf->upstream.cache_lock = NGX_CONF_UNSET; 1102 conf->upstream.cache_lock = NGX_CONF_UNSET;
1095 conf->upstream.cache_lock_timeout = NGX_CONF_UNSET_MSEC; 1103 conf->upstream.cache_lock_timeout = NGX_CONF_UNSET_MSEC;
1104 conf->upstream.cache_revalidate = NGX_CONF_UNSET;
1096 #endif 1105 #endif
1097 1106
1098 conf->upstream.hide_headers = NGX_CONF_UNSET_PTR; 1107 conf->upstream.hide_headers = NGX_CONF_UNSET_PTR;
1099 conf->upstream.pass_headers = NGX_CONF_UNSET_PTR; 1108 conf->upstream.pass_headers = NGX_CONF_UNSET_PTR;
1100 1109
1330 ngx_conf_merge_value(conf->upstream.cache_lock, 1339 ngx_conf_merge_value(conf->upstream.cache_lock,
1331 prev->upstream.cache_lock, 0); 1340 prev->upstream.cache_lock, 0);
1332 1341
1333 ngx_conf_merge_msec_value(conf->upstream.cache_lock_timeout, 1342 ngx_conf_merge_msec_value(conf->upstream.cache_lock_timeout,
1334 prev->upstream.cache_lock_timeout, 5000); 1343 prev->upstream.cache_lock_timeout, 5000);
1344
1345 ngx_conf_merge_value(conf->upstream.cache_revalidate,
1346 prev->upstream.cache_revalidate, 0);
1335 1347
1336 #endif 1348 #endif
1337 1349
1338 ngx_conf_merge_value(conf->upstream.pass_request_headers, 1350 ngx_conf_merge_value(conf->upstream.pass_request_headers,
1339 prev->upstream.pass_request_headers, 1); 1351 prev->upstream.pass_request_headers, 1);