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
12 years ago · 5811610d71
2 changed files with 4 additions and 1 deletions
--- a/3
+++ b/3
@ -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)
--- 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: