IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-19 05:33:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Upstream: proxy_cache_convert_head directive.

Browse Source 
The directive toggles conversion of HEAD to GET for cacheable proxy requests.
When disabled, $request_method must be added to cache key for consistency.
By default, HEAD is converted to GET as before.
This commit is contained in:
Roman Arutyunyan 2015-11-11 15:47:30 +03:00
parent 93aef089b4
commit 89a049be89
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/http/modules/ngx_http_proxy_module.c
View File

@ -533,6 +533,13 @@ static ngx_command_t ngx_http_proxy_commands[] = {
offsetof(ngx_http_proxy_loc_conf_t, upstream.cache_revalidate), offsetof(ngx_http_proxy_loc_conf_t, upstream.cache_revalidate),
NULL }, NULL },
{ ngx_string("proxy_cache_convert_head"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
ngx_conf_set_flag_slot,
NGX_HTTP_LOC_CONF_OFFSET,
offsetof(ngx_http_proxy_loc_conf_t, upstream.cache_convert_head),
NULL },
#endif #endif
{ ngx_string("proxy_temp_path"), { ngx_string("proxy_temp_path"),
@ -2845,6 +2852,7 @@ ngx_http_proxy_create_loc_conf(ngx_conf_t *cf)
conf->upstream.cache_lock_timeout = NGX_CONF_UNSET_MSEC; conf->upstream.cache_lock_timeout = NGX_CONF_UNSET_MSEC;
conf->upstream.cache_lock_age = NGX_CONF_UNSET_MSEC; conf->upstream.cache_lock_age = NGX_CONF_UNSET_MSEC;
conf->upstream.cache_revalidate = NGX_CONF_UNSET; conf->upstream.cache_revalidate = NGX_CONF_UNSET;
conf->upstream.cache_convert_head = NGX_CONF_UNSET;
#endif #endif
conf->upstream.hide_headers = NGX_CONF_UNSET_PTR; conf->upstream.hide_headers = NGX_CONF_UNSET_PTR;
@ -3143,6 +3151,9 @@ ngx_http_proxy_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
ngx_conf_merge_value(conf->upstream.cache_revalidate, ngx_conf_merge_value(conf->upstream.cache_revalidate,
prev->upstream.cache_revalidate, 0); prev->upstream.cache_revalidate, 0);
ngx_conf_merge_value(conf->upstream.cache_convert_head,
prev->upstream.cache_convert_head, 1);
#endif #endif
ngx_conf_merge_str_value(conf->method, prev->method, ""); ngx_conf_merge_str_value(conf->method, prev->method, "");

2
src/http/ngx_http_upstream.c
View File

@ -764,7 +764,7 @@ ngx_http_upstream_cache(ngx_http_request_t *r, ngx_http_upstream_t *u)
return rc; return rc;
} }
if (r->method & NGX_HTTP_HEAD) { if ((r->method & NGX_HTTP_HEAD) && u->conf->cache_convert_head) {
u->method = ngx_http_core_get_method; u->method = ngx_http_core_get_method;
} }

1
src/http/ngx_http_upstream.h
View File

@ -193,6 +193,7 @@ typedef struct {
ngx_msec_t cache_lock_age; ngx_msec_t cache_lock_age;
ngx_flag_t cache_revalidate; ngx_flag_t cache_revalidate;
ngx_flag_t cache_convert_head;
ngx_array_t *cache_valid; ngx_array_t *cache_valid;
ngx_array_t *cache_bypass; ngx_array_t *cache_bypass;