Mercurial > hg > nginx
comparison src/core/ngx_conf_file.c @ 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 | 389aeafc3b84 |
children |
comparison
equal
deleted
inserted
replaced
1989:0ba9a893dd1a | 1990:c7757ce0ae97 |
---|---|
923 ngx_array_t **a; | 923 ngx_array_t **a; |
924 ngx_conf_post_t *post; | 924 ngx_conf_post_t *post; |
925 | 925 |
926 a = (ngx_array_t **) (p + cmd->offset); | 926 a = (ngx_array_t **) (p + cmd->offset); |
927 | 927 |
928 if (*a == NULL) { | 928 if (*a == NGX_CONF_UNSET_PTR) { |
929 *a = ngx_array_create(cf->pool, 4, sizeof(ngx_str_t)); | 929 *a = ngx_array_create(cf->pool, 4, sizeof(ngx_str_t)); |
930 if (*a == NULL) { | 930 if (*a == NULL) { |
931 return NGX_CONF_ERROR; | 931 return NGX_CONF_ERROR; |
932 } | 932 } |
933 } | 933 } |