diff options
| author | Valentin Bartenev <vbart@nginx.com> | 2014-12-22 12:59:02 +0300 |
|---|---|---|
| committer | Valentin Bartenev <vbart@nginx.com> | 2014-12-22 12:59:02 +0300 |
| commit | c40a72761c909aca80fb27d9df12fa3043afbaa2 (patch) | |
| tree | 9bb116b484cfebd8723f51442dc6eb5f867885d9 /src/http/ngx_http_upstream.c | |
| parent | 66dcbab7a13bc0cf5212aebd662dcb23cec8808d (diff) | |
| download | nginx-c40a72761c909aca80fb27d9df12fa3043afbaa2.tar.gz nginx-c40a72761c909aca80fb27d9df12fa3043afbaa2.zip | |
Upstream: refactored proxy_cache and friends.
The configuration handling code has changed to look similar to the proxy_store
directive and friends. This simplifies adding variable support in the following
patch.
No functional changes.
Diffstat (limited to 'src/http/ngx_http_upstream.c')
| -rw-r--r-- | src/http/ngx_http_upstream.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c index 0693f0529..b2066a3ef 100644 --- a/src/http/ngx_http_upstream.c +++ b/src/http/ngx_http_upstream.c @@ -780,7 +780,7 @@ ngx_http_upstream_cache(ngx_http_request_t *r, ngx_http_upstream_t *u) c->min_uses = u->conf->cache_min_uses; c->body_start = u->conf->buffer_size; - c->file_cache = u->conf->cache->data; + c->file_cache = u->conf->cache_zone->data; c->lock = u->conf->cache_lock; c->lock_timeout = u->conf->cache_lock_timeout; @@ -2538,7 +2538,7 @@ ngx_http_upstream_send_response(ngx_http_request_t *r, ngx_http_upstream_t *u) r->cache->min_uses = u->conf->cache_min_uses; r->cache->body_start = u->conf->buffer_size; - r->cache->file_cache = u->conf->cache->data; + r->cache->file_cache = u->conf->cache_zone->data; if (ngx_http_file_cache_create(r) != NGX_OK) { ngx_http_upstream_finalize_request(r, u, NGX_ERROR); @@ -5545,7 +5545,7 @@ ngx_http_upstream_hide_headers_hash(ngx_conf_t *cf, if (conf->hide_headers_hash.buckets #if (NGX_HTTP_CACHE) - && ((conf->cache == NULL) == (prev->cache == NULL)) + && ((conf->cache == 0) == (prev->cache == 0)) #endif ) { |