diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2017-11-03 00:48:04 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2017-11-03 00:48:04 +0300 |
| commit | 00fc9e80c601ce2092d4fed32340076565bc1f06 (patch) | |
| tree | 92e8568bf795dc72104f38a03557d4c3e9527f03 /sapi | |
| parent | 95b33f239447df2f029259bfefcbe5e05dbedf2f (diff) | |
| download | php-git-00fc9e80c601ce2092d4fed32340076565bc1f06.tar.gz | |
Disable RC_DEBUG for FPM initialisation
Diffstat (limited to 'sapi')
| -rw-r--r-- | sapi/fpm/fpm/fpm_main.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c index dd0269e353..36be193048 100644 --- a/sapi/fpm/fpm/fpm_main.c +++ b/sapi/fpm/fpm/fpm_main.c @@ -1595,6 +1595,10 @@ int main(int argc, char *argv[]) int force_stderr = 0; int php_information = 0; int php_allow_to_run_as_root = 0; + int ret; +#if ZEND_RC_DEBUG + zend_bool old_rc_debug; +#endif #ifdef HAVE_SIGNAL_H #if defined(SIGPIPE) && defined(SIG_IGN) @@ -1858,7 +1862,18 @@ consult the installation file that came with this distribution, or visit \n\ } } - if (0 > fpm_init(argc, argv, fpm_config ? fpm_config : CGIG(fpm_config), fpm_prefix, fpm_pid, test_conf, php_allow_to_run_as_root, force_daemon, force_stderr)) { +#if ZEND_RC_DEBUG + old_rc_debug = zend_rc_debug; + zend_rc_debug = 0; +#endif + + ret = fpm_init(argc, argv, fpm_config ? fpm_config : CGIG(fpm_config), fpm_prefix, fpm_pid, test_conf, php_allow_to_run_as_root, force_daemon, force_stderr); + +#if ZEND_RC_DEBUG + zend_rc_debug = old_rc_debug; +#endif + + if (ret < 0) { if (fpm_globals.send_config_pipe[1]) { int writeval = 0; |