Mercurial > hg > nginx-quic
comparison src/http/modules/ngx_http_fastcgi_module.c @ 1523:b7d39d0b0025 stable-0.5
r1453 merge:
change ngx_conf_merge_ptr_value() and update fastcgi_catch_stderr
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Sun, 23 Sep 2007 19:15:42 +0000 |
parents | d59617e7e6a1 |
children | 44bd4db45b30 |
comparison
equal
deleted
inserted
replaced
1522:ba92cccf5435 | 1523:b7d39d0b0025 |
---|---|
1638 * conf->upstream.next_upstream = 0; | 1638 * conf->upstream.next_upstream = 0; |
1639 * conf->upstream.temp_path = NULL; | 1639 * conf->upstream.temp_path = NULL; |
1640 * conf->upstream.hide_headers_hash = { NULL, 0 }; | 1640 * conf->upstream.hide_headers_hash = { NULL, 0 }; |
1641 * conf->upstream.hide_headers = NULL; | 1641 * conf->upstream.hide_headers = NULL; |
1642 * conf->upstream.pass_headers = NULL; | 1642 * conf->upstream.pass_headers = NULL; |
1643 * conf->upstream.catch_stderr = NULL; | |
1644 * conf->upstream.schema = { 0, NULL }; | 1643 * conf->upstream.schema = { 0, NULL }; |
1645 * conf->upstream.uri = { 0, NULL }; | 1644 * conf->upstream.uri = { 0, NULL }; |
1646 * conf->upstream.location = NULL; | 1645 * conf->upstream.location = NULL; |
1647 * conf->upstream.store_lengths = NULL; | 1646 * conf->upstream.store_lengths = NULL; |
1648 * conf->upstream.store_values = NULL; | 1647 * conf->upstream.store_values = NULL; |
1672 | 1671 |
1673 conf->upstream.intercept_errors = NGX_CONF_UNSET; | 1672 conf->upstream.intercept_errors = NGX_CONF_UNSET; |
1674 | 1673 |
1675 /* "fastcgi_cyclic_temp_file" is disabled */ | 1674 /* "fastcgi_cyclic_temp_file" is disabled */ |
1676 conf->upstream.cyclic_temp_file = 0; | 1675 conf->upstream.cyclic_temp_file = 0; |
1676 | |
1677 conf->catch_stderr = NGX_CONF_UNSET_PTR; | |
1677 | 1678 |
1678 return conf; | 1679 return conf; |
1679 } | 1680 } |
1680 | 1681 |
1681 | 1682 |