com php-src: Fixed Bug #68478 acess_log don't use pre fix: sapi/fpm/fpm/fpm_conf.c sapi/fpm/fpm/fpm_log .c sapi/fpm/php-fpm.conf.in

Commit: b924af8db99e97ef328a9833c8d7073b6193dec8 Author: Remi Collet <remi@php.net> Sat, 22 Nov 2014 10:25:53 +0100 Parents: 515fa6160d22156f605a9bcb41db810ccad99097 Branches: PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b924af8db99e97ef328a9833c8d7073b6193dec8 Log: Fixed Bug #68478 acess_log don't use prefix Calling fpm_conf_process_all_pools before fpm_log_open allow to use fpm_evaluate_full_path and so to honor global prefix or pool prefix for access.log Bugs: https://bugs.php.net/68478 Changed paths: M sapi/fpm/fpm/fpm_conf.c M sapi/fpm/fpm/fpm_log.c M sapi/fpm/php-fpm.conf.in Diff: diff --git a/sapi/fpm/fpm/fpm_conf.c b/sapi/fpm/fpm/fpm_conf.c index dab4c8b..1f73bc9 100644 --- a/sapi/fpm/fpm/fpm_conf.c +++ b/sapi/fpm/fpm/fpm_conf.c @@ -1200,15 +1200,15 @@ static int fpm_conf_post_process(int force_daemon TSRMLS_DC) /* {{{ */ return -1; } - if (0 > fpm_log_open(0)) { + if (0 > fpm_event_pre_init(fpm_global_config.events_mechanism)) { return -1; } - if (0 > fpm_event_pre_init(fpm_global_config.events_mechanism)) { + if (0 > fpm_conf_process_all_pools()) { return -1; } - if (0 > fpm_conf_process_all_pools()) { + if (0 > fpm_log_open(0)) { return -1; } diff --git a/sapi/fpm/fpm/fpm_log.c b/sapi/fpm/fpm/fpm_log.c index c71281b..b0bf32a 100644 --- a/sapi/fpm/fpm/fpm_log.c +++ b/sapi/fpm/fpm/fpm_log.c @@ -46,6 +46,8 @@ int fpm_log_open(int reopen) /* {{{ */ if (0 > fd) { zlog(ZLOG_SYSERROR, "failed to open access log (%s)", wp->config->access_log); return -1; + } else { + zlog(ZLOG_DEBUG, "open access log (%s)", wp->config->access_log); } if (reopen) { diff --git a/sapi/fpm/php-fpm.conf.in b/sapi/fpm/php-fpm.conf.in index 2b15660..833a4f4 100644 --- a/sapi/fpm/php-fpm.conf.in +++ b/sapi/fpm/php-fpm.conf.in @@ -131,6 +131,7 @@ ; Per pool prefix ; It only applies on the following directives: +; - 'access.log' ; - 'slowlog' ; - 'listen' (unixsocket) ; - 'chroot'