# HG changeset patch # User Igor Sysoev # Date 1275583327 0 # Node ID e2d54eb7472e863b5980567b5effd16797151730 # Parent 20708cffd6dc87ab7cd1f51a929680e4a001e0b8 rename variable to conform to the next commit diff --git a/src/http/modules/ngx_http_fastcgi_module.c b/src/http/modules/ngx_http_fastcgi_module.c --- a/src/http/modules/ngx_http_fastcgi_module.c +++ b/src/http/modules/ngx_http_fastcgi_module.c @@ -2021,7 +2021,7 @@ ngx_http_fastcgi_merge_loc_conf(ngx_conf u_char *p; size_t size; uintptr_t *code; - ngx_str_t *h; + ngx_str_t *hide; ngx_uint_t i; ngx_array_t headers_names; ngx_keyval_t *src; @@ -2249,16 +2249,16 @@ ngx_http_fastcgi_merge_loc_conf(ngx_conf #if (NGX_HTTP_CACHE) - h = conf->upstream.cache ? ngx_http_fastcgi_hide_cache_headers: - ngx_http_fastcgi_hide_headers; + hide = conf->upstream.cache ? ngx_http_fastcgi_hide_cache_headers: + ngx_http_fastcgi_hide_headers; #else - h = ngx_http_fastcgi_hide_headers; + hide = ngx_http_fastcgi_hide_headers; #endif if (ngx_http_upstream_hide_headers_hash(cf, &conf->upstream, - &prev->upstream, h, &hash) + &prev->upstream, hide, &hash) != NGX_OK) { return NGX_CONF_ERROR;