com php-src: Merge branch 'PHP-5.4' into PHP-5.5: NEWS sapi/fpm/php-fpm.conf.in
| From: | Stanislav Malyshev | Date: | Mon, 14 Apr 2014 00:31:44 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: NEWS sapi/fpm/php-fpm.conf.in | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76855@lists.php.net to get a copy of this message | ||
Commit: 5811610d713471a100a1a7f8ab8e00a1c4b12522
Author: Stanislav Malyshev <stas@php.net> Sun, 13 Apr 2014 17:31:14 -0700
Parents: df8e34bcc133bec10daa01dee3c2eb0fe59bb4bb 636adf251c80884c151cb233bbdae1497fdadc4a
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5811610d713471a100a1a7f8ab8e00a1c4b12522
Log:
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
Bugs:
https://bugs.php.net/66482
Changed paths:
MM NEWS
MM sapi/fpm/php-fpm.conf.in
Diff:
diff --cc NEWS
index 67c7b54,a059e07..9f11dcb
--- a/NEWS
+++ b/NEWS
@@@ -22,9 -22,8 +22,12 @@@ PH
. Fixed bug #66987 (Memory corruption in fileinfo ext / bigendian).
(Remi)
+ - FPM:
- . Fixed bug #66482 (unknown entry 'priority' in php-fpm.conf).
++ . 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)
- SimpleXML:
. Fixed bug #66084 (simplexml_load_string() mangles empty node name)