use shared ngx_http_upstream_ignore_headers_masks[]

This commit is contained in:
Igor Sysoev 2010-07-02 09:25:38 +00:00
parent 749e620d74
commit 3ad024c19a
6 changed files with 14 additions and 31 deletions

View file

@ -183,15 +183,6 @@ static ngx_conf_bitmask_t ngx_http_fastcgi_next_upstream_masks[] = {
};
static ngx_conf_bitmask_t ngx_http_fastcgi_ignore_headers_masks[] = {
{ ngx_string("X-Accel-Redirect"), NGX_HTTP_UPSTREAM_IGN_XA_REDIRECT },
{ ngx_string("X-Accel-Expires"), NGX_HTTP_UPSTREAM_IGN_XA_EXPIRES },
{ ngx_string("Expires"), NGX_HTTP_UPSTREAM_IGN_EXPIRES },
{ ngx_string("Cache-Control"), NGX_HTTP_UPSTREAM_IGN_CACHE_CONTROL },
{ ngx_null_string, 0 }
};
ngx_module_t ngx_http_fastcgi_module;
@ -430,7 +421,7 @@ static ngx_command_t ngx_http_fastcgi_commands[] = {
ngx_conf_set_bitmask_slot,
NGX_HTTP_LOC_CONF_OFFSET,
offsetof(ngx_http_fastcgi_loc_conf_t, upstream.ignore_headers),
&ngx_http_fastcgi_ignore_headers_masks },
&ngx_http_upstream_ignore_headers_masks },
{ ngx_string("fastcgi_catch_stderr"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,

View file

@ -157,15 +157,6 @@ static ngx_conf_bitmask_t ngx_http_proxy_next_upstream_masks[] = {
};
static ngx_conf_bitmask_t ngx_http_proxy_ignore_headers_masks[] = {
{ ngx_string("X-Accel-Redirect"), NGX_HTTP_UPSTREAM_IGN_XA_REDIRECT },
{ ngx_string("X-Accel-Expires"), NGX_HTTP_UPSTREAM_IGN_XA_EXPIRES },
{ ngx_string("Expires"), NGX_HTTP_UPSTREAM_IGN_EXPIRES },
{ ngx_string("Cache-Control"), NGX_HTTP_UPSTREAM_IGN_CACHE_CONTROL },
{ ngx_null_string, 0 }
};
ngx_module_t ngx_http_proxy_module;
@ -432,7 +423,7 @@ static ngx_command_t ngx_http_proxy_commands[] = {
ngx_conf_set_bitmask_slot,
NGX_HTTP_LOC_CONF_OFFSET,
offsetof(ngx_http_proxy_loc_conf_t, upstream.ignore_headers),
&ngx_http_proxy_ignore_headers_masks },
&ngx_http_upstream_ignore_headers_masks },
#if (NGX_HTTP_SSL)

View file

@ -296,7 +296,7 @@ static ngx_command_t ngx_http_scgi_commands[] = {
ngx_conf_set_bitmask_slot,
NGX_HTTP_LOC_CONF_OFFSET,
offsetof(ngx_http_scgi_loc_conf_t, upstream.ignore_headers),
&ngx_http_scgi_ignore_headers_masks },
&ngx_http_upstream_ignore_headers_masks },
ngx_null_command
};

View file

@ -83,15 +83,6 @@ static ngx_conf_bitmask_t ngx_http_uwsgi_next_upstream_masks[] = {
};
static ngx_conf_bitmask_t ngx_http_uwsgi_ignore_headers_masks[] = {
{ ngx_string("X-Accel-Redirect"), NGX_HTTP_UPSTREAM_IGN_XA_REDIRECT },
{ ngx_string("X-Accel-Expires"), NGX_HTTP_UPSTREAM_IGN_XA_EXPIRES },
{ ngx_string("Expires"), NGX_HTTP_UPSTREAM_IGN_EXPIRES },
{ ngx_string("Cache-Control"), NGX_HTTP_UPSTREAM_IGN_CACHE_CONTROL },
{ ngx_null_string, 0 }
};
ngx_module_t ngx_http_uwsgi_module;
@ -330,7 +321,7 @@ static ngx_command_t ngx_http_uwsgi_commands[] = {
ngx_conf_set_bitmask_slot,
NGX_HTTP_LOC_CONF_OFFSET,
offsetof(ngx_http_uwsgi_loc_conf_t, upstream.ignore_headers),
&ngx_http_uwsgi_ignore_headers_masks },
&ngx_http_upstream_ignore_headers_masks },
ngx_null_command
};

View file

@ -355,6 +355,15 @@ ngx_conf_bitmask_t ngx_http_upstream_cache_method_mask[] = {
};
ngx_conf_bitmask_t ngx_http_upstream_ignore_headers_masks[] = {
{ ngx_string("X-Accel-Redirect"), NGX_HTTP_UPSTREAM_IGN_XA_REDIRECT },
{ ngx_string("X-Accel-Expires"), NGX_HTTP_UPSTREAM_IGN_XA_EXPIRES },
{ ngx_string("Expires"), NGX_HTTP_UPSTREAM_IGN_EXPIRES },
{ ngx_string("Cache-Control"), NGX_HTTP_UPSTREAM_IGN_CACHE_CONTROL },
{ ngx_null_string, 0 }
};
ngx_int_t
ngx_http_upstream_create(ngx_http_request_t *r)
{

View file

@ -337,6 +337,7 @@ ngx_int_t ngx_http_upstream_hide_headers_hash(ngx_conf_t *cf,
extern ngx_module_t ngx_http_upstream_module;
extern ngx_conf_bitmask_t ngx_http_upstream_cache_method_mask[];
extern ngx_conf_bitmask_t ngx_http_upstream_ignore_headers_masks[];
#endif /* _NGX_HTTP_UPSTREAM_H_INCLUDED_ */