diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2008-05-04 09:29:43 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2008-05-04 09:29:43 +0000 |
| commit | dbfc1e75645d07b2948c965244208ba6e10c98b3 (patch) | |
| tree | 85b735c3768b4a890754875c722f3ccb12587647 /src/http/ngx_http_upstream.h | |
| parent | 5eac378ff0c5db707745060014527e01c4bf612b (diff) | |
| download | nginx-dbfc1e75645d07b2948c965244208ba6e10c98b3.tar.gz nginx-dbfc1e75645d07b2948c965244208ba6e10c98b3.tar.bz2 | |
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()
Diffstat (limited to 'src/http/ngx_http_upstream.h')
| -rw-r--r-- | src/http/ngx_http_upstream.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/http/ngx_http_upstream.h b/src/http/ngx_http_upstream.h index c1ec48fcc..15987b1b1 100644 --- a/src/http/ngx_http_upstream.h +++ b/src/http/ngx_http_upstream.h @@ -259,6 +259,9 @@ ngx_int_t ngx_http_upstream_header_variable(ngx_http_request_t *r, void ngx_http_upstream_init(ngx_http_request_t *r); ngx_http_upstream_srv_conf_t *ngx_http_upstream_add(ngx_conf_t *cf, ngx_url_t *u, ngx_uint_t flags); +ngx_int_t ngx_http_upstream_hide_headers_hash(ngx_conf_t *cf, + ngx_http_upstream_conf_t *conf, ngx_http_upstream_conf_t *prev, + ngx_str_t *default_hide_headers, ngx_hash_init_t *hash); #define ngx_http_conf_upstream_srv_conf(uscf, module) \ |