nginx: src/http/ngx_http_upstream.c comparison

proxy_cache_pass, fastcgi_cache_bypass, uwsgi_cache_bypass, scgi_cache_bypass

comparison

equal deleted inserted replaced

-:d11227f0107f
+:b0a0686a85bb
 c = r->cache;
 if (c == NULL) {
-rc = ngx_http_test_predicates(r, u->conf->no_cache);
+switch (ngx_http_test_predicates(r, u->conf->cache_bypass)) {
-if (rc != NGX_OK) {
-return rc;
+case NGX_ERROR:
+return NGX_ERROR;
+case NGX_DECLINED:
+u->cache_status = NGX_HTTP_CACHE_BYPASS;
+return NGX_DECLINED;
+default: /* NGX_OK */
+break;
 }
 if (!(r->method & u->conf->cache_methods)) {
 return NGX_DECLINED;
 }
 if (r->cache && r->cache->file.fd != NGX_INVALID_FILE) {
 ngx_pool_run_cleanup_file(r->pool, r->cache->file.fd);
 r->cache->file.fd = NGX_INVALID_FILE;
 }
+switch (ngx_http_test_predicates(r, u->conf->no_cache)) {
+case NGX_ERROR:
+ngx_http_upstream_finalize_request(r, u, 0);
+return;
+case NGX_DECLINED:
+u->cacheable = 0;
+break;
+default: /* NGX_OK */
+if (u->cache_status == NGX_HTTP_CACHE_BYPASS) {
+if (ngx_http_file_cache_new(r) != NGX_OK) {
+ngx_http_upstream_finalize_request(r, u, 0);
+return;
+}
+if (u->create_key(r) != NGX_OK) {
+ngx_http_upstream_finalize_request(r, u, 0);
+return;
+}
+/* TODO: add keys */
+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;
+if (ngx_http_file_cache_create(r) != NGX_OK) {
+ngx_http_upstream_finalize_request(r, u, 0);
+return;
+}
+u->cacheable = 1;
+}
+break;
+}
 if (u->cacheable) {
 time_t  now, valid;
 now = ngx_time();

Mercurial > hg > nginx