From 03cf70ab1e35305443ac379ee5219d19aeeb6ba2 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Sat, 8 Nov 2014 17:22:54 -0500 Subject: Fixed bug #68381 Set FPM log level earlier during init MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The log level will be ignored throughout log events in fpm_unix_init_main, until the very end when zlog_set_level is finally called. In particular, fpm_unix_conf_wp may throw notices like this: > [08-Nov-2014 17:13:36] NOTICE: [pool www] 'user' directive is ignored when… Which will still appear even if log_level in php-fpm.conf is set to warning+ --- sapi/fpm/fpm/fpm_unix.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sapi/fpm/fpm/fpm_unix.c b/sapi/fpm/fpm/fpm_unix.c index ea0e67369c..5dfdb4ab38 100644 --- a/sapi/fpm/fpm/fpm_unix.c +++ b/sapi/fpm/fpm/fpm_unix.c @@ -231,6 +231,8 @@ int fpm_unix_init_main() /* {{{ */ struct fpm_worker_pool_s *wp; int is_root = !geteuid(); + zlog_set_level(fpm_globals.log_level); + if (fpm_global_config.rlimit_files) { struct rlimit r; @@ -361,7 +363,6 @@ int fpm_unix_init_main() /* {{{ */ } } - zlog_set_level(fpm_globals.log_level); return 0; } /* }}} */ -- cgit v1.2.1 From 5674827eaded0390a6447babd9d9eae450bb4d00 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 18 Nov 2014 17:43:28 +0100 Subject: NEWS --- NEWS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NEWS b/NEWS index 2d3dd86385..6b9b050382 100644 --- a/NEWS +++ b/NEWS @@ -11,6 +11,8 @@ PHP NEWS . Fixed bug #68421 (access.format='%R' doesn't log ipv6 address). (Remi) . Fixed bug #68423 (PHP-FPM will no longer load all pools). (Remi) . Fixed bug #68428 (listen.allowed_clients is IPv4 only). (Remi) + . Fixed bug #68381 (fpm_unix_init_main ignores log_level). + (David Zuelke, Remi) - PDO_pgsql: . Fixed bug #66584 (Segmentation fault on statement deallocation) (Matteo) -- cgit v1.2.1 From 858c9d86faf6acbc9cbd4a8e4aecf9147690df57 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 19 Nov 2014 16:46:51 +0100 Subject: Fixed bug #68452 php-fpm man page is oudated (-g, -R, -z) --- sapi/fpm/php-fpm.8.in | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/sapi/fpm/php-fpm.8.in b/sapi/fpm/php-fpm.8.in index b02aa25ba7..f6ad963aed 100644 --- a/sapi/fpm/php-fpm.8.in +++ b/sapi/fpm/php-fpm.8.in @@ -84,6 +84,13 @@ Version number Specify alternative prefix path (the default is @php_fpm_prefix@) .TP .PD 0 +.B \-\-pid \fIfile\fP +.TP +.PD 1 +.B \-g +Specify the PID file location. +.TP +.PD 0 .B \-\-fpm\-config \fIfile\fP .TP .PD 1 @@ -113,12 +120,11 @@ Force to run in background and ignore daemonize option from configuration file. Force to stay in foreground and ignore daemonize option from configuration file. .TP .PD 0 -.B \-\-zend\-extension \fIfile\fP +.B \-\-allow\-to\-run\-as\-root .TP .PD 1 -.B \-z \fIfile\fP -Load Zend extension -.IR file +.B \-R +Allow pool to run as root (disabled by default) .SH FILES .TP 15 .B php-fpm.conf -- cgit v1.2.1 From d438bcf2266ee1ddc56901fab65e022573874594 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 19 Nov 2014 16:47:52 +0100 Subject: NEWS --- NEWS | 1 + 1 file changed, 1 insertion(+) diff --git a/NEWS b/NEWS index 6b9b050382..cae7d0b268 100644 --- a/NEWS +++ b/NEWS @@ -13,6 +13,7 @@ PHP NEWS . Fixed bug #68428 (listen.allowed_clients is IPv4 only). (Remi) . Fixed bug #68381 (fpm_unix_init_main ignores log_level). (David Zuelke, Remi) + . Fixed bug #68452 (php-fpm man page is oudated). (Remi) - PDO_pgsql: . Fixed bug #66584 (Segmentation fault on statement deallocation) (Matteo) -- cgit v1.2.1 From c5a1c5f5a4c69ef9af505655b371a63b29a289b4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 19 Nov 2014 16:49:05 +0100 Subject: Fixed bug #68452 php-fpm man page is oudated (-O) --- sapi/fpm/php-fpm.8.in | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sapi/fpm/php-fpm.8.in b/sapi/fpm/php-fpm.8.in index f6ad963aed..3a697c6a65 100644 --- a/sapi/fpm/php-fpm.8.in +++ b/sapi/fpm/php-fpm.8.in @@ -120,6 +120,13 @@ Force to run in background and ignore daemonize option from configuration file. Force to stay in foreground and ignore daemonize option from configuration file. .TP .PD 0 +.B \-\-force-stderr +.TP +.PD 1 +.B \-O +Force output to stderr in nodaemonize even if stderr is not a TTY. +.TP +.PD 0 .B \-\-allow\-to\-run\-as\-root .TP .PD 1 -- cgit v1.2.1 From a521d7e1beb5e8e627597a6f735b82a0810dfeff Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 19 Nov 2014 16:49:23 +0100 Subject: NEWS --- NEWS | 1 + 1 file changed, 1 insertion(+) diff --git a/NEWS b/NEWS index 53f3dfabe4..7de8c7ad04 100644 --- a/NEWS +++ b/NEWS @@ -15,6 +15,7 @@ PHP NEWS . Fixed bug #68428 (listen.allowed_clients is IPv4 only). (Remi) . Fixed bug #68381 (fpm_unix_init_main ignores log_level). (David Zuelke, Remi) + . Fixed bug #68452 (php-fpm man page is oudated). (Remi) GMP: . Fixed bug #68419 (build error with gmp 4.1). (Remi) -- cgit v1.2.1