diff options
Diffstat (limited to 'sapi/fpm/fpm/fpm_conf.c')
| -rw-r--r-- | sapi/fpm/fpm/fpm_conf.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sapi/fpm/fpm/fpm_conf.c b/sapi/fpm/fpm/fpm_conf.c index 0fa77169ea..b92e5de634 100644 --- a/sapi/fpm/fpm/fpm_conf.c +++ b/sapi/fpm/fpm/fpm_conf.c @@ -29,7 +29,6 @@ #include "xml_config.h" #include "zlog.h" - struct fpm_global_config_s fpm_global_config; static void *fpm_global_config_ptr() /* {{{ */ @@ -551,11 +550,13 @@ int fpm_conf_init_main() /* {{{ */ } if (filename == NULL) { - filename = PHP_FPM_CONF_PATH; + spprintf(&filename, 0, "%s/php-fpm.conf", PHP_SYSCONFDIR); + err = xml_conf_load_file(filename); + efree(filename); + } else { + err = xml_conf_load_file(filename); } - err = xml_conf_load_file(filename); - if (err) { zlog(ZLOG_STUFF, ZLOG_ERROR, "failed to load configuration file: %s", err); return -1; |