Mercurial > hg > nginx

comparison src/http/ngx_http_upstream.c @ 2961:31526449835f stable-0.7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge r2950, r2951: cache related fixes: *) fix building --without-http-cache, broken in r2945 *) fix ./configure error message
author Igor Sysoev <igor@sysoev.ru>
date Mon, 22 Jun 2009 09:29:10 +0000
parents f892042956e3
children b0c1ce16b5bd
comparison
equal deleted inserted replaced
2960:7282f9d25521 2961:31526449835f
4084 && conf->pass_headers == NGX_CONF_UNSET_PTR) 4084 && conf->pass_headers == NGX_CONF_UNSET_PTR)
4085 { 4085 {
4086 conf->hide_headers_hash = prev->hide_headers_hash; 4086 conf->hide_headers_hash = prev->hide_headers_hash;
4087 4087
4088 if (conf->hide_headers_hash.buckets 4088 if (conf->hide_headers_hash.buckets
4089 && ((conf->cache == NULL) == (prev->cache == NULL))) 4089 #if (NGX_HTTP_CACHE)
4090 && ((conf->cache == NULL) == (prev->cache == NULL))
4091 #endif
4092 )
4090 { 4093 {
4091 return NGX_OK; 4094 return NGX_OK;
4092 } 4095 }
4093 4096
4094 conf->hide_headers = prev->hide_headers; 4097 conf->hide_headers = prev->hide_headers;