Mercurial > hg > nginx-vendor-current

comparison src/http/ngx_http_upstream.c @ 498:207ae3ff0444 NGINX_0_8_1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.8.1 *) Feature: the "updating" parameter in "proxy_cache_use_stale" and "fastcgi_cache_use_stale" directives. *) Bugfix: the "If-Modified-Since", "If-Range", etc. client request header lines were passed to backend while caching if no "proxy_set_header" directive was used with any parameters. *) Bugfix: the "Set-Cookie" and "P3P" response header lines were not hidden while caching if no "proxy_hide_header/fastcgi_hide_header" directives were used with any parameters. *) Bugfix: the ngx_http_image_filter_module did not support GIF87a format. Thanks to Denis Ilyinyh. *) Bugfix: nginx could not be built modules on Solaris 10 and early; the bug had appeared in 0.7.56.
author Igor Sysoev <http://sysoev.ru>
date Mon, 08 Jun 2009 00:00:00 +0400
parents f39b9e29530d
children f0cac61857ae
comparison
equal deleted inserted replaced
497:77fae36a61b3 498:207ae3ff0444
575 c->body_start = u->conf->buffer_size; 575 c->body_start = u->conf->buffer_size;
576 c->file_cache = u->conf->cache->data; 576 c->file_cache = u->conf->cache->data;
577 577
578 rc = ngx_http_file_cache_open(r); 578 rc = ngx_http_file_cache_open(r);
579 579
580 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, 580 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
581 "http upstream cache: %i u:%ui", rc, c->uses); 581 "http upstream cache: %i", rc);
582
583 if (rc == NGX_HTTP_CACHE_UPDATING) {
584 if (u->conf->cache_use_stale & NGX_HTTP_UPSTREAM_FT_UPDATING) {
585 rc = NGX_OK;
586
587 } else {
588 rc = NGX_HTTP_CACHE_STALE;
589 }
590 }
582 591
583 if (rc == NGX_OK) { 592 if (rc == NGX_OK) {
584 593
585 rc = ngx_http_upstream_cache_send(r, u); 594 rc = ngx_http_upstream_cache_send(r, u);
586 595
4074 if (conf->hide_headers == NGX_CONF_UNSET_PTR 4083 if (conf->hide_headers == NGX_CONF_UNSET_PTR
4075 && conf->pass_headers == NGX_CONF_UNSET_PTR) 4084 && conf->pass_headers == NGX_CONF_UNSET_PTR)
4076 { 4085 {
4077 conf->hide_headers_hash = prev->hide_headers_hash; 4086 conf->hide_headers_hash = prev->hide_headers_hash;
4078 4087
4079 if (conf->hide_headers_hash.buckets) { 4088 if (conf->hide_headers_hash.buckets
4089 && ((conf->cache == NULL) == (prev->cache == NULL)))
4090 {
4080 return NGX_OK; 4091 return NGX_OK;
4081 } 4092 }
4082 4093
4083 conf->hide_headers = prev->hide_headers; 4094 conf->hide_headers = prev->hide_headers;
4084 conf->pass_headers = prev->pass_headers; 4095 conf->pass_headers = prev->pass_headers;