From: Stanislav Malyshev <stas@php.net>
Date: Mon, 14 Apr 2014 00:32:09 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~390^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c1d5937f7fba1230f14af47877615c8973abf7ff;p=php

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
---

c1d5937f7fba1230f14af47877615c8973abf7ff
diff --cc NEWS
index 0dd2d2120e,9f11dcbb99..8b656aa105
--- 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)