From: Remi Collet <remi@php.net>
Date: Sat, 22 Nov 2014 09:25:53 +0000 (+0100)
Subject: Fixed Bug #68478 acess_log don't use prefix
X-Git-Tag: php-5.6.4RC1~42
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b924af8db99e97ef328a9833c8d7073b6193dec8;p=php

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
---

diff --git a/sapi/fpm/fpm/fpm_conf.c b/sapi/fpm/fpm/fpm_conf.c
index dab4c8bf6b..1f73bc915c 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 c71281b0b9..b0bf32ac16 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 2b1566047f..833a4f4f8c 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'