Mercurial > hg > nginx
comparison src/http/ngx_http_upstream.h @ 1990:c7757ce0ae97 stable-0.5
r1699, r1700, r1701, r1702, r1707 merge:
upstream parse_header fix and optimization,
fix fastcgi_catch_stderr segfault merged in r1524:
*) return NGX_HTTP_UPSTREAM_INVALID_HEADER for invalid status
*) return NGX_ERROR instead of NGX_HTTP_INTERNAL_SERVER_ERROR
in u->parse_header()
*) return NGX_HTTP_UPSTREAM_INVALID_HEADER instead of NGX_HTTP_BAD_GATEWAY
to go to a next upstream on invalid_header condition
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
this fixes fastcgi_catch_stderr segfault
*) ngx_http_upstream_hide_headers_hash()
*) proxy/fastcgi pass_header/hide_header use
ngx_http_upstream_hide_headers_hash()
| author | Igor Sysoev <igor@sysoev.ru> |
|---|---|
| date | Sun, 04 May 2008 09:29:43 +0000 |
| parents | 6b81bbc36eaf |
| children | ee49a83b6de2 |
comparison
equal
deleted
inserted
replaced
| 1989:0ba9a893dd1a | 1990:c7757ce0ae97 |
|---|---|
| 257 ngx_http_variable_value_t *v, uintptr_t data); | 257 ngx_http_variable_value_t *v, uintptr_t data); |
| 258 | 258 |
| 259 void ngx_http_upstream_init(ngx_http_request_t *r); | 259 void ngx_http_upstream_init(ngx_http_request_t *r); |
| 260 ngx_http_upstream_srv_conf_t *ngx_http_upstream_add(ngx_conf_t *cf, | 260 ngx_http_upstream_srv_conf_t *ngx_http_upstream_add(ngx_conf_t *cf, |
| 261 ngx_url_t *u, ngx_uint_t flags); | 261 ngx_url_t *u, ngx_uint_t flags); |
| 262 ngx_int_t ngx_http_upstream_hide_headers_hash(ngx_conf_t *cf, | |
| 263 ngx_http_upstream_conf_t *conf, ngx_http_upstream_conf_t *prev, | |
| 264 ngx_str_t *default_hide_headers, ngx_hash_init_t *hash); | |
| 262 | 265 |
| 263 | 266 |
| 264 #define ngx_http_conf_upstream_srv_conf(uscf, module) \ | 267 #define ngx_http_conf_upstream_srv_conf(uscf, module) \ |
| 265 uscf->srv_conf[module.ctx_index] | 268 uscf->srv_conf[module.ctx_index] |
| 266 | 269 |