com php-src: Fix naming: sapi/fpm/fpm/fpm_conf.c
| From: | Bob Weinand | Date: | Fri, 13 Nov 2015 14:01:10 +0000 |
| Subject: | com php-src: Fix naming: sapi/fpm/fpm/fpm_conf.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-90304@lists.php.net to get a copy of this message | ||
Commit: 0dc8a8cac006bf83d73c18e0cd1f0c19c7af3366
Author: Gordon Oheim <info@gordon-oheim.de> Fri, 13 Nov 2015 15:01:10 +0100
Parents: 3a5fa926bfc409963f500144ea6d5e890e712a86
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0dc8a8cac006bf83d73c18e0cd1f0c19c7af3366
Log:
Fix naming
The global section is named "General", but the correct section name is "global".
It is "global" in #1313 and also "global" in https://github.com/php/php-src/blob/master/sapi/fpm/php-fpm.conf.in.
The commit fixes the naming. However, the proposed change might break any tooling that relies on
finding "General" in the output though.
Bugs:
https://bugs.php.net/1313
Changed paths:
M sapi/fpm/fpm/fpm_conf.c
Diff:
diff --git a/sapi/fpm/fpm/fpm_conf.c b/sapi/fpm/fpm/fpm_conf.c
index 9a619ce..2a92fb2 100644
--- a/sapi/fpm/fpm/fpm_conf.c
+++ b/sapi/fpm/fpm/fpm_conf.c
@@ -1573,7 +1573,7 @@ static void fpm_conf_dump() /* {{{ */
/*
* Please keep the same order as in fpm_conf.h and in php-fpm.conf.in
*/
- zlog(ZLOG_NOTICE, "[General]");
+ zlog(ZLOG_NOTICE, "[global]");
zlog(ZLOG_NOTICE, "\tpid = %s",
STR2STR(fpm_global_config.pid_file));
zlog(ZLOG_NOTICE, "\terror_log = %s",
STR2STR(fpm_global_config.error_log));
#ifdef HAVE_SYSLOG_H