com php-src: Fix bug #66482, replace wrong item name 'priority' with 'process.priority' in php-fpm.conf: NEWS sapi/fpm/php-fpm.conf.in
| From: | Stanislav Malyshev | Date: | Mon, 14 Apr 2014 00:30:50 +0000 |
| Subject: | com php-src: Fix bug #66482, replace wrong item name 'priority' with 'process.priority' in php-fpm.conf: NEWS sapi/fpm/php-fpm.conf.in | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76854@lists.php.net to get a copy of this message | ||
Commit: 636adf251c80884c151cb233bbdae1497fdadc4a
Author: itxx00 <itxx00@gmail.com> Thu, 16 Jan 2014 16:34:39 +0800
Committer: Stanislav Malyshev <stas@php.net> Sun, 13 Apr 2014 17:30:50 -0700
Parents: 3a2660b30254def0fdf7f955d89ac6ee331d5045
Branches: PHP-5.4 PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=636adf251c80884c151cb233bbdae1497fdadc4a
Log:
Fix bug #66482, replace wrong item name 'priority' with 'process.priority' in
php-fpm.conf
Bugs:
https://bugs.php.net/66482
Changed paths:
M NEWS
M sapi/fpm/php-fpm.conf.in
Diff:
diff --git a/NEWS b/NEWS
index 92b2961..a059e07 100644
--- a/NEWS
+++ b/NEWS
@@ -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).
+
- SimpleXML:
. Fixed bug #66084 (simplexml_load_string() mangles empty node name)
(Anatol)
diff --git a/sapi/fpm/php-fpm.conf.in b/sapi/fpm/php-fpm.conf.in
index 6ce9b63..1e70f2c 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: