comparison src/http/ngx_http_upstream.h @ 578:f3a9e57d2e17

Merge with current.
author Maxim Dounin <mdounin@mdounin.ru>
date Thu, 11 Mar 2010 21:27:17 +0300
parents 2da4537168f8
children ff463db0be31
comparison
equal deleted inserted replaced
539:5f4de8cf0d9d 578:f3a9e57d2e17
78 void *data; 78 void *data;
79 } ngx_http_upstream_peer_t; 79 } ngx_http_upstream_peer_t;
80 80
81 81
82 typedef struct { 82 typedef struct {
83 ngx_peer_addr_t *addrs; 83 ngx_addr_t *addrs;
84 ngx_uint_t naddrs; 84 ngx_uint_t naddrs;
85 ngx_uint_t weight; 85 ngx_uint_t weight;
86 ngx_uint_t max_fails; 86 ngx_uint_t max_fails;
87 time_t fail_timeout; 87 time_t fail_timeout;
88 88
149 ngx_path_t *temp_path; 149 ngx_path_t *temp_path;
150 150
151 ngx_hash_t hide_headers_hash; 151 ngx_hash_t hide_headers_hash;
152 ngx_array_t *hide_headers; 152 ngx_array_t *hide_headers;
153 ngx_array_t *pass_headers; 153 ngx_array_t *pass_headers;
154
155 ngx_addr_t *local;
154 156
155 #if (NGX_HTTP_CACHE) 157 #if (NGX_HTTP_CACHE)
156 ngx_shm_zone_t *cache; 158 ngx_shm_zone_t *cache;
157 159
158 ngx_uint_t cache_min_uses; 160 ngx_uint_t cache_min_uses;
319 321
320 ngx_int_t ngx_http_upstream_create(ngx_http_request_t *r); 322 ngx_int_t ngx_http_upstream_create(ngx_http_request_t *r);
321 void ngx_http_upstream_init(ngx_http_request_t *r); 323 void ngx_http_upstream_init(ngx_http_request_t *r);
322 ngx_http_upstream_srv_conf_t *ngx_http_upstream_add(ngx_conf_t *cf, 324 ngx_http_upstream_srv_conf_t *ngx_http_upstream_add(ngx_conf_t *cf,
323 ngx_url_t *u, ngx_uint_t flags); 325 ngx_url_t *u, ngx_uint_t flags);
326 char *ngx_http_upstream_bind_set_slot(ngx_conf_t *cf, ngx_command_t *cmd,
327 void *conf);
324 ngx_int_t ngx_http_upstream_hide_headers_hash(ngx_conf_t *cf, 328 ngx_int_t ngx_http_upstream_hide_headers_hash(ngx_conf_t *cf,
325 ngx_http_upstream_conf_t *conf, ngx_http_upstream_conf_t *prev, 329 ngx_http_upstream_conf_t *conf, ngx_http_upstream_conf_t *prev,
326 ngx_str_t *default_hide_headers, ngx_hash_init_t *hash); 330 ngx_str_t *default_hide_headers, ngx_hash_init_t *hash);
327 331
328 332
332 336
333 extern ngx_module_t ngx_http_upstream_module; 337 extern ngx_module_t ngx_http_upstream_module;
334 extern ngx_conf_bitmask_t ngx_http_upstream_cache_method_mask[]; 338 extern ngx_conf_bitmask_t ngx_http_upstream_cache_method_mask[];
335 339
336 340
337
338 #endif /* _NGX_HTTP_UPSTREAM_H_INCLUDED_ */ 341 #endif /* _NGX_HTTP_UPSTREAM_H_INCLUDED_ */