summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoritxx00 <itxx00@gmail.com>2014-01-16 16:34:39 +0800
committerStanislav Malyshev <stas@php.net>2014-04-13 17:30:50 -0700
commit636adf251c80884c151cb233bbdae1497fdadc4a (patch)
tree6e17865783e9f8a4763890f13ead633a43f57e62
parent3a2660b30254def0fdf7f955d89ac6ee331d5045 (diff)
downloadphp-git-636adf251c80884c151cb233bbdae1497fdadc4a.tar.gz
Fix bug #66482, replace wrong item name 'priority' with 'process.priority' in php-fpm.conf
-rw-r--r--NEWS3
-rw-r--r--sapi/fpm/php-fpm.conf.in2
2 files changed, 4 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 92b2961df8..a059e075f2 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 6ce9b63256..1e70f2c1c1 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: