diff options
| author | Remi Collet <remi@php.net> | 2014-11-19 16:48:21 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2014-11-19 16:48:21 +0100 |
| commit | 4a36482378373aa5dc584213f100f92525f50eb4 (patch) | |
| tree | 692f31ce5fba170b81f10165fb7ab0e92e43ff81 /sapi | |
| parent | c40e665ecd32806c2b01e601867a788dd324dc1f (diff) | |
| parent | d438bcf2266ee1ddc56901fab65e022573874594 (diff) | |
| download | php-git-4a36482378373aa5dc584213f100f92525f50eb4.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
NEWS
Fixed bug #68452 php-fpm man page is oudated (-g, -R, -z)
NEWS
Fixed bug #68381 Set FPM log level earlier during init
Diffstat (limited to 'sapi')
| -rw-r--r-- | sapi/fpm/php-fpm.8.in | 14 |
1 files 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 |