diff options
| author | Remi Collet <remi@php.net> | 2014-11-19 16:49:37 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2014-11-19 16:49:37 +0100 |
| commit | cf00c1b2e7efbf7954ada39d87b8de7f80d30570 (patch) | |
| tree | 42ef334e5e71fa1e66d167f9d7e94d7bd093121c | |
| parent | 64a39dc7b07d4b54d050a3a5c15045fe91c0b651 (diff) | |
| parent | a521d7e1beb5e8e627597a6f735b82a0810dfeff (diff) | |
| download | php-git-cf00c1b2e7efbf7954ada39d87b8de7f80d30570.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
NEWS
Fixed bug #68452 php-fpm man page is oudated (-O)
NEWS
Fixed bug #68452 php-fpm man page is oudated (-g, -R, -z)
NEWS
Fixed bug #68381 Set FPM log level earlier during init
| -rw-r--r-- | sapi/fpm/php-fpm.8.in | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/sapi/fpm/php-fpm.8.in b/sapi/fpm/php-fpm.8.in index b02aa25ba7..3a697c6a65 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,18 @@ 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 \-\-force-stderr .TP .PD 1 -.B \-z \fIfile\fP -Load Zend extension -.IR file +.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 +.B \-R +Allow pool to run as root (disabled by default) .SH FILES .TP 15 .B php-fpm.conf |