comparison src/http/modules/ngx_http_proxy_module.c @ 3667:12bd9e26fadb

use shared ngx_http_upstream_ignore_headers_masks[]
author Igor Sysoev <igor@sysoev.ru>
date Fri, 02 Jul 2010 09:25:38 +0000
parents a2a3378824ba
children 2728c4e4a9ae
comparison
equal deleted inserted replaced
3666:cd6d45c0a119 3667:12bd9e26fadb
155 { ngx_string("off"), NGX_HTTP_UPSTREAM_FT_OFF }, 155 { ngx_string("off"), NGX_HTTP_UPSTREAM_FT_OFF },
156 { ngx_null_string, 0 } 156 { ngx_null_string, 0 }
157 }; 157 };
158 158
159 159
160 static ngx_conf_bitmask_t ngx_http_proxy_ignore_headers_masks[] = {
161 { ngx_string("X-Accel-Redirect"), NGX_HTTP_UPSTREAM_IGN_XA_REDIRECT },
162 { ngx_string("X-Accel-Expires"), NGX_HTTP_UPSTREAM_IGN_XA_EXPIRES },
163 { ngx_string("Expires"), NGX_HTTP_UPSTREAM_IGN_EXPIRES },
164 { ngx_string("Cache-Control"), NGX_HTTP_UPSTREAM_IGN_CACHE_CONTROL },
165 { ngx_null_string, 0 }
166 };
167
168
169 ngx_module_t ngx_http_proxy_module; 160 ngx_module_t ngx_http_proxy_module;
170 161
171 162
172 static ngx_command_t ngx_http_proxy_commands[] = { 163 static ngx_command_t ngx_http_proxy_commands[] = {
173 164
430 { ngx_string("proxy_ignore_headers"), 421 { ngx_string("proxy_ignore_headers"),
431 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE, 422 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE,
432 ngx_conf_set_bitmask_slot, 423 ngx_conf_set_bitmask_slot,
433 NGX_HTTP_LOC_CONF_OFFSET, 424 NGX_HTTP_LOC_CONF_OFFSET,
434 offsetof(ngx_http_proxy_loc_conf_t, upstream.ignore_headers), 425 offsetof(ngx_http_proxy_loc_conf_t, upstream.ignore_headers),
435 &ngx_http_proxy_ignore_headers_masks }, 426 &ngx_http_upstream_ignore_headers_masks },
436 427
437 #if (NGX_HTTP_SSL) 428 #if (NGX_HTTP_SSL)
438 429
439 { ngx_string("proxy_ssl_session_reuse"), 430 { ngx_string("proxy_ssl_session_reuse"),
440 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, 431 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,