diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2007-09-23 19:15:42 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2007-09-23 19:15:42 +0000 |
| commit | ab605f1ac0fd925fac542036db3c50e786a255f1 (patch) | |
| tree | 989063f7f195089f455149b17c1b6d4f48f3c271 /src | |
| parent | f7030b1ba53b04f483d5a9721336af4634a58bbd (diff) | |
| download | nginx-ab605f1ac0fd925fac542036db3c50e786a255f1.tar.gz nginx-ab605f1ac0fd925fac542036db3c50e786a255f1.tar.bz2 | |
r1453 merge:
change ngx_conf_merge_ptr_value() and update fastcgi_catch_stderr
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/ngx_conf_file.h | 4 | ||||
| -rw-r--r-- | src/http/modules/ngx_http_fastcgi_module.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/core/ngx_conf_file.h b/src/core/ngx_conf_file.h index 7d5112919..c065384b0 100644 --- a/src/core/ngx_conf_file.h +++ b/src/core/ngx_conf_file.h @@ -257,8 +257,8 @@ char *ngx_conf_check_num_bounds(ngx_conf_t *cf, void *post, void *data); } #define ngx_conf_merge_ptr_value(conf, prev, default) \ - if (conf == NULL) { \ - conf = (prev == NULL) ? default : prev; \ + if (conf == NGX_CONF_UNSET_PTR) { \ + conf = (prev == NGX_CONF_UNSET_PTR) ? default : prev; \ } #define ngx_conf_merge_uint_value(conf, prev, default) \ diff --git a/src/http/modules/ngx_http_fastcgi_module.c b/src/http/modules/ngx_http_fastcgi_module.c index c1ce79ce7..ac14d75ce 100644 --- a/src/http/modules/ngx_http_fastcgi_module.c +++ b/src/http/modules/ngx_http_fastcgi_module.c @@ -1640,7 +1640,6 @@ ngx_http_fastcgi_create_loc_conf(ngx_conf_t *cf) * conf->upstream.hide_headers_hash = { NULL, 0 }; * conf->upstream.hide_headers = NULL; * conf->upstream.pass_headers = NULL; - * conf->upstream.catch_stderr = NULL; * conf->upstream.schema = { 0, NULL }; * conf->upstream.uri = { 0, NULL }; * conf->upstream.location = NULL; @@ -1675,6 +1674,8 @@ ngx_http_fastcgi_create_loc_conf(ngx_conf_t *cf) /* "fastcgi_cyclic_temp_file" is disabled */ conf->upstream.cyclic_temp_file = 0; + conf->catch_stderr = NGX_CONF_UNSET_PTR; + return conf; } |