diff options
| author | Anatol Belski <ab@php.net> | 2014-11-19 23:21:34 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-11-19 23:21:34 +0100 |
| commit | 14fa5339f86cac3a1b3ecfdf50c4ee0f31ca214e (patch) | |
| tree | 948e486d8550692e8ef4c63baf59a343cf073c93 | |
| parent | 0180912823c87d25e4d0ef96c4a060a4c1b71d75 (diff) | |
| parent | f7674519804dc7000a56ef9fe12c49461ff0333a (diff) | |
| download | php-git-14fa5339f86cac3a1b3ecfdf50c4ee0f31ca214e.tar.gz | |
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
NEWS
Fix #68355: Inconsistency in example php.ini comments
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-- | php.ini-development | 4 | ||||
| -rw-r--r-- | php.ini-production | 4 | ||||
| -rw-r--r-- | sapi/fpm/php-fpm.8.in | 21 |
3 files changed, 22 insertions, 7 deletions
diff --git a/php.ini-development b/php.ini-development index 61519f05aa..a3cb5a3b78 100644 --- a/php.ini-development +++ b/php.ini-development @@ -674,7 +674,7 @@ auto_append_file = ; http://php.net/default-mimetype default_mimetype = "text/html" -; PHP's default character set is set to UTF-8 +; PHP's default character set is set to UTF-8. ; http://php.net/default-charset default_charset = "UTF-8" @@ -753,7 +753,7 @@ enable_dl = Off ; will look for to know it is OK to continue execution. Setting this variable MAY ; cause security issues, KNOW WHAT YOU ARE DOING FIRST. ; http://php.net/cgi.redirect-status-env -;cgi.redirect_status_env = +;cgi.redirect_status_env = ; cgi.fix_pathinfo provides *real* PATH_INFO/PATH_TRANSLATED support for CGI. PHP's ; previous behaviour was to set PATH_TRANSLATED to SCRIPT_FILENAME, and to not grok diff --git a/php.ini-production b/php.ini-production index a455b825b5..15d432564f 100644 --- a/php.ini-production +++ b/php.ini-production @@ -674,7 +674,7 @@ auto_append_file = ; http://php.net/default-mimetype default_mimetype = "text/html" -; PHP's default character set is set to empty. +; PHP's default character set is set to UTF-8. ; http://php.net/default-charset default_charset = "UTF-8" @@ -684,10 +684,12 @@ default_charset = "UTF-8" ;internal_encoding = ; PHP input character encoding is set to empty. +; If empty, default_charset is used. ; http://php.net/input-encoding ;input_encoding = ; PHP output character encoding is set to empty. +; If empty, default_charset is used. ; mbstring or iconv output handler is used. ; See also output_buffer. ; http://php.net/output-encoding 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 |