comparison src/http/ngx_http_upstream.h @ 635:e67b227c8dbb default tip

Merge with current.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 25 Apr 2011 04:07:55 +0400
parents 428c6e58046a
children
comparison
equal deleted inserted replaced
578:f3a9e57d2e17 635:e67b227c8dbb
41 41
42 #define NGX_HTTP_UPSTREAM_IGN_XA_REDIRECT 0x00000002 42 #define NGX_HTTP_UPSTREAM_IGN_XA_REDIRECT 0x00000002
43 #define NGX_HTTP_UPSTREAM_IGN_XA_EXPIRES 0x00000004 43 #define NGX_HTTP_UPSTREAM_IGN_XA_EXPIRES 0x00000004
44 #define NGX_HTTP_UPSTREAM_IGN_EXPIRES 0x00000008 44 #define NGX_HTTP_UPSTREAM_IGN_EXPIRES 0x00000008
45 #define NGX_HTTP_UPSTREAM_IGN_CACHE_CONTROL 0x00000010 45 #define NGX_HTTP_UPSTREAM_IGN_CACHE_CONTROL 0x00000010
46 #define NGX_HTTP_UPSTREAM_IGN_SET_COOKIE 0x00000020
46 47
47 48
48 typedef struct { 49 typedef struct {
49 ngx_msec_t bl_time; 50 ngx_msec_t bl_time;
50 ngx_uint_t bl_state; 51 ngx_uint_t bl_state;
51 52
52 ngx_uint_t status; 53 ngx_uint_t status;
53 time_t response_sec; 54 time_t response_sec;
54 ngx_uint_t response_msec; 55 ngx_uint_t response_msec;
55 off_t response_length; 56 off_t response_length;
56 57
57 ngx_str_t *peer; 58 ngx_str_t *peer;
58 } ngx_http_upstream_state_t; 59 } ngx_http_upstream_state_t;
59 60
60 61
160 ngx_uint_t cache_min_uses; 161 ngx_uint_t cache_min_uses;
161 ngx_uint_t cache_use_stale; 162 ngx_uint_t cache_use_stale;
162 ngx_uint_t cache_methods; 163 ngx_uint_t cache_methods;
163 164
164 ngx_array_t *cache_valid; 165 ngx_array_t *cache_valid;
166 ngx_array_t *cache_bypass;
167 ngx_array_t *no_cache;
165 #endif 168 #endif
166 169
167 ngx_array_t *store_lengths; 170 ngx_array_t *store_lengths;
168 ngx_array_t *store_values; 171 ngx_array_t *store_values;
169 172
334 uscf->srv_conf[module.ctx_index] 337 uscf->srv_conf[module.ctx_index]
335 338
336 339
337 extern ngx_module_t ngx_http_upstream_module; 340 extern ngx_module_t ngx_http_upstream_module;
338 extern ngx_conf_bitmask_t ngx_http_upstream_cache_method_mask[]; 341 extern ngx_conf_bitmask_t ngx_http_upstream_cache_method_mask[];
342 extern ngx_conf_bitmask_t ngx_http_upstream_ignore_headers_masks[];
339 343
340 344
341 #endif /* _NGX_HTTP_UPSTREAM_H_INCLUDED_ */ 345 #endif /* _NGX_HTTP_UPSTREAM_H_INCLUDED_ */