diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-04-13 17:31:14 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-04-13 17:31:44 -0700 |
| commit | 5811610d713471a100a1a7f8ab8e00a1c4b12522 (patch) | |
| tree | 5826116ea5181db7097cca67a6561d5fb883422e | |
| parent | df8e34bcc133bec10daa01dee3c2eb0fe59bb4bb (diff) | |
| parent | 636adf251c80884c151cb233bbdae1497fdadc4a (diff) | |
| download | php-git-5811610d713471a100a1a7f8ab8e00a1c4b12522.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #66482, replace wrong item name 'priority' with 'process.priority' in php-fpm.conf
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | sapi/fpm/php-fpm.conf.in | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -22,6 +22,9 @@ PHP NEWS . Fixed bug #66987 (Memory corruption in fileinfo ext / bigendian). (Remi) +- FPM: + . Fixed bug #66482 (unknown entry 'priority' in php-fpm.conf). + - mysqli: . Fixed problem in mysqli_commit()/mysqli_rollback() with second parameter (extra comma) and third parameters (lack of escaping). (Andrey) diff --git a/sapi/fpm/php-fpm.conf.in b/sapi/fpm/php-fpm.conf.in index ab03736beb..acdff31f17 100644 --- a/sapi/fpm/php-fpm.conf.in +++ b/sapi/fpm/php-fpm.conf.in @@ -185,7 +185,7 @@ listen = 127.0.0.1:9000 ; - The pool processes will inherit the master process priority ; unless it specified otherwise ; Default Value: no set -; priority = -19 +; process.priority = -19 ; Choose how the process manager will control the number of child processes. ; Possible Values: |