Mercurial > hg > nginx

diff src/http/modules/ngx_http_fastcgi_module.c @ 1452:cd586e963db0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
change ngx_conf_merge_ptr_value() and update fastcgi_catch_stderr
author Igor Sysoev <igor@sysoev.ru>
date Sat, 01 Sep 2007 12:05:55 +0000
parents 5383f5232364
children 0e66eabd18b5
line wrap: on
line diff
--- 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_con
      *     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_con
     /* "fastcgi_cyclic_temp_file" is disabled */
     conf->upstream.cyclic_temp_file = 0;
 
+    conf->catch_stderr = NGX_CONF_UNSET_PTR;
+
     return conf;
 }