From: Stanislav Malyshev <stas@php.net>
Date: Mon, 14 Apr 2014 00:31:14 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.12RC1~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5811610d713471a100a1a7f8ab8e00a1c4b12522;p=php

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

5811610d713471a100a1a7f8ab8e00a1c4b12522
diff --cc NEWS
index 67c7b54891,a059e075f2..9f11dcbb99
--- 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)