From: David Zülke <dzuelke@gmail.com>
Date: Thu, 13 Mar 2014 15:51:44 +0000 (+0100)
Subject: Fix 5.5.10 NEWS
X-Git-Tag: php-5.5.11RC1~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=db6c33875ca87673e33f02706dd8d4c42a07d59f;p=php

Fix 5.5.10 NEWS

The FPM change didn't make it into 5.5.10 but will instead be in 5.5.11; http://php.net/Changelog-5.php, the release and the NEWS file in the release accurately reflect this, but the 5.5 branch NEWS doesn't (as the release was made and tagged from the last RC, which didn't contain that change yet).
---

diff --git a/NEWS b/NEWS
index a6a41c2c6a..f5a0411b0e 100644
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,10 @@ PHP                                                                        NEWS
   . Fix compilation on libcurl versions between 7.10.5 and 7.12.2, inclusive.
     (Adam)
 
+- FPM:
+  . Added clear_env configuration directive to disable clearenv() call.
+  (Github PR# 598, Paul Annesley)
+
 - GD:
   . Fixed bug #66714 (imageconvolution breakage). (Brad Daily)
   . Fixed bug #66869 (Invalid 2nd argument crashes imageaffinematrixget) (Pierre)
@@ -56,10 +60,6 @@ PHP                                                                        NEWS
   . Fixed bug #66820 (out-of-bounds memory access in fileinfo)
     (CVE-2014-2270). (Remi)
 
-- FPM:
-  . Added clear_env configuration directive to disable clearenv() call.
-  (Github PR# 598, Paul Annesley)
-
 - GD
   . Fixed Bug #66815 (imagecrop(): insufficient fix for NULL defer
     CVE-2013-7327). (Tomas Hoger, Remi)