diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-06-15 09:30:59 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2009-06-15 09:30:59 +0000 |
| commit | 47246d6a1d65bb11c6db7d074ed8d317813ccfdb (patch) | |
| tree | f3e1310f363bded05528853d3195d0b33b486cba /src/http/ngx_http_upstream.h | |
| parent | 2374ad792c1bf5c90ed90151dfee8d52408382b9 (diff) | |
| download | nginx-47246d6a1d65bb11c6db7d074ed8d317813ccfdb.tar.gz nginx-47246d6a1d65bb11c6db7d074ed8d317813ccfdb.tar.bz2 | |
merge r2895, r2896, r2926, r2927, r2928, r2930, and r2936:
various proxy/fastcgi cache features and fixes:
*) report about proxy/fastcgi_store and proxy/fastcgi_cache incompatibility
*) delete useless r->cache->uses
*) proxy_cache_use_stale/fastcgi_cache_use_stale updating
*) inherit proxy_set_header, proxy_hide_header, and fastcgi_hide_header
only if cache settings are similar
*) add response file uniq while loading cold cache on demand
Diffstat (limited to '')
| -rw-r--r-- | src/http/ngx_http_upstream.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/http/ngx_http_upstream.h b/src/http/ngx_http_upstream.h index 488aed5a8..eb97d3989 100644 --- a/src/http/ngx_http_upstream.h +++ b/src/http/ngx_http_upstream.h @@ -24,8 +24,9 @@ #define NGX_HTTP_UPSTREAM_FT_HTTP_503 0x00000040 #define NGX_HTTP_UPSTREAM_FT_HTTP_504 0x00000080 #define NGX_HTTP_UPSTREAM_FT_HTTP_404 0x00000100 -#define NGX_HTTP_UPSTREAM_FT_BUSY_LOCK 0x00000200 -#define NGX_HTTP_UPSTREAM_FT_MAX_WAITING 0x00000400 +#define NGX_HTTP_UPSTREAM_FT_UPDATING 0x00000200 +#define NGX_HTTP_UPSTREAM_FT_BUSY_LOCK 0x00000400 +#define NGX_HTTP_UPSTREAM_FT_MAX_WAITING 0x00000800 #define NGX_HTTP_UPSTREAM_FT_NOLIVE 0x40000000 #define NGX_HTTP_UPSTREAM_FT_OFF 0x80000000 |