From: Stanislav Malyshev <stas@php.net>
Date: Mon, 7 Jul 2014 07:38:16 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~119^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=effb2b7a1312ecf952d6a752c0ce6190f7aede1e;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix bug #67052 (NumberFormatter::parse() resets LC_NUMERIC setting)
  Make sure the generator script also creates a newline at the end of file
  Add newline at end of file to prevent compilation warning
---

effb2b7a1312ecf952d6a752c0ce6190f7aede1e
diff --cc NEWS
index b85d422c2f,122d7faf25..783eca81e7
--- a/NEWS
+++ b/NEWS
@@@ -7,14 -13,17 +7,18 @@@ PH
      generator). (Nikita)
    . Fixed bug #67151 (strtr with empty array crashes). (Nikita)
  
 -- CLI server:
 -  . Implemented FR #67429 (CLI server is missing some new HTTP response codes).
 -    (Adam)
 -
 -- FPM:
 -  . Fixed bug #67531 (syslog cannot be set in pool configuration). (Remi)
 -
+ - Intl:
+   . Fixed bug #67052 (NumberFormatter::parse() resets LC_NUMERIC setting).
+     (Stas)
+ 
 +- pgsql:
 +  . Fix bug #67555 (Cannot build against libpq 7.3). (Adam)
 +
 +- SPL:
 +  . Fixed bug #67539 (ArrayIterator use-after-free due to object change during 
 +    sorting). (research at insighti dot org, Laruence)
 +  . Fixed bug #67538 (SPL Iterators use-after-free). (CVE-2014-4670) (Laruence)
 +
  - OPCache:
    . Fixed bug #67215 (php-cgi work with opcache, may be segmentation fault
      happen) (Dmitry, Laruence)