com php-src: Merge branch 'PHP-5.5' into PHP-5.6: NEWS
| From: | Stanislav Malyshev | Date: | Mon, 14 Apr 2014 00:32:42 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: NEWS | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76856@lists.php.net to get a copy of this message | ||
Commit: c1d5937f7fba1230f14af47877615c8973abf7ff
Author: Stanislav Malyshev <stas@php.net> Sun, 13 Apr 2014 17:32:09 -0700
Parents: 04a11b850a17103d5a508932c768d423fbf6d870 5811610d713471a100a1a7f8ab8e00a1c4b12522
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c1d5937f7fba1230f14af47877615c8973abf7ff
Log:
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
Bugs:
https://bugs.php.net/66482
Changed paths:
MM NEWS
Diff:
diff --cc NEWS
index 0dd2d21,9f11dcb..8b656aa
--- a/NEWS
+++ b/NEWS
@@@ -18,12 -15,23 +18,15 @@@ PH
. Fixed bug #66721 (__wakeup of DateTime segfaults when invalid object data is
supplied). (Boro Sitnikovski)
-- Embed:
- . Fixed bug #65715 (php5embed.lib isn't provided anymore). (Anatol).
-
-- Fileinfo:
- .. Fixed bug #66987 (Memory corruption in fileinfo ext / bigendian).
- (Remi)
-
+ - FPM:
+ . 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)
+- mysqlnd:
+ . Added a new fetching mode to mysqlnd. (Andrey)
-- SimpleXML:
- . Fixed bug #66084 (simplexml_load_string() mangles empty node name)
- (Anatol)
+- PDO:
+ . Fixed bug #66604 ('pdo/php_pdo_error.h' not copied to the include dir).
+ (Matteo)
- SQLite:
. Fixed bug #66967 (Updated bundled libsqlite to 3.8.4.3). (Anatol)