diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-04-13 17:32:09 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-04-13 17:32:42 -0700 |
| commit | c1d5937f7fba1230f14af47877615c8973abf7ff (patch) | |
| tree | 2be98fc16c5fd422668d7793264be5a2406e40c8 | |
| parent | 04a11b850a17103d5a508932c768d423fbf6d870 (diff) | |
| parent | 5811610d713471a100a1a7f8ab8e00a1c4b12522 (diff) | |
| download | php-git-c1d5937f7fba1230f14af47877615c8973abf7ff.tar.gz | |
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
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | sapi/fpm/php-fpm.conf.in | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -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) 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: |