From: Stanislav Malyshev Date: Mon, 7 Jul 2014 07:49:33 +0000 (-0700) Subject: Merge branch 'PHP-5.5' into PHP-5.6 X-Git-Tag: PRE_PHPNG_MERGE~118^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=04a227dd1610355ce2a86a3bad718c86eed1e6fa;p=php Merge branch 'PHP-5.5' into PHP-5.6 * PHP-5.5: Fix bug #66921 - Wrong argument type hint for function intltz_from_date_time_zone fix format --- 04a227dd1610355ce2a86a3bad718c86eed1e6fa diff --cc NEWS index 783eca81e7,a1c52b3dfd..a717429605 --- a/NEWS +++ b/NEWS @@@ -7,18 -13,19 +7,20 @@@ 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 #66921 (Wrong argument type hint for function ++ . Fixed bug #66921 (Wrong argument type hint for function + intltz_from_date_time_zone). (Stas) . Fixed bug #67052 (NumberFormatter::parse() resets LC_NUMERIC setting). (Stas) +- pgsql: - . Fix bug #67555 (Cannot build against libpq 7.3). (Adam) ++ . Fixed 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)