Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5: Fix bug #66482, replace wrong item name 'priority' with 'process.priority' in php-fpm.conf
12 years ago · c1d5937f7f
2 changed files with 4 additions and 1 deletions
--- a/3
+++ b/3
@ -18,6 +18,9 @@ PHP                                                                        NEWS
  . Fixed bug #66721 (__wakeup of DateTime segfaults when invalid object data is
    supplied). (Boro Sitnikovski)

+- FPM:
+  . Fixed bug #66482 (unknown entry 'priority' in php-fpm.conf).
+
 - mysqlnd:
  . Added a new fetching mode to mysqlnd. (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: