diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2007-12-09 18:03:20 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2007-12-09 18:03:20 +0000 |
| commit | cb540618856bf0f45d0228f34279a57bd0cc6796 (patch) | |
| tree | 3e54501c8c5ae7f68a65a5d597991cf788c9e2d7 /src/core/ngx_conf_file.c | |
| parent | d8c43746a509fc0e45e3f6668aadb2237e39979c (diff) | |
| download | nginx-cb540618856bf0f45d0228f34279a57bd0cc6796.tar.gz nginx-cb540618856bf0f45d0228f34279a57bd0cc6796.zip | |
*) now ngx_conf_set_str_array_slot() tests NGX_CONF_UNSET_PTR
this fixes fastcgi_catch_stderr segfault introduced in r1453
*) ngx_http_upstream_hide_headers_hash()
*) proxy/fastcgi pass_header/hide_header use
ngx_http_upstream_hide_headers_hash()
Diffstat (limited to 'src/core/ngx_conf_file.c')
| -rw-r--r-- | src/core/ngx_conf_file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/ngx_conf_file.c b/src/core/ngx_conf_file.c index 6084abb4b..f00cf019b 100644 --- a/src/core/ngx_conf_file.c +++ b/src/core/ngx_conf_file.c @@ -934,7 +934,7 @@ ngx_conf_set_str_array_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) a = (ngx_array_t **) (p + cmd->offset); - if (*a == NULL) { + if (*a == NGX_CONF_UNSET_PTR) { *a = ngx_array_create(cf->pool, 4, sizeof(ngx_str_t)); if (*a == NULL) { return NGX_CONF_ERROR; |