com php-src: Merge branch 'PHP-5.4' into PHP-5.5: NEWS ext/phar/phar_object.c

Commit: 5312c39cfbcd366cd287d1ea855b847bb9ebda51 Author: Stanislav Malyshev <stas@php.net> Tue, 8 Jul 2014 12:54:02 -0700 Parents: 5cf0084a92022a7c84b2047945d62680dd50c62b 0bf50a8302af94357595a21877e224fa42729e25 Branches: PHP-5.5 PHP-5.6 master Link: http://git.php..net/?p=php-src.git;a=commitdiff;h=5312c39cfbcd366cd287d1ea855b847bb9ebda51 Log: Merge branch 'PHP-5.4' into PHP-5.5 * PHP-5.4: Fix bug #67587: Redirection loop on nginx with FPM Bugs: https://bugs.php.net/67587 Changed paths: MM NEWS MM ext/phar/phar_object.c Diff: diff --cc NEWS index cfdd26c,ff025e1..b56ba35 --- a/NEWS +++ b/NEWS @@@ -39,11 -31,9 +39,14 @@@ PH . Fixed bug #67550 (Error in code "form" instead of "from", pgsql.c, line 756), which affected builds against libpq < 7.3. (Adam) + - Phar: + . Fixed bug #67587 (Redirection loop on nginx with FPM). (Christian Weiske) + +- 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) + - Streams: . Fixed bug #67430 (http:// wrapper doesn't follow 308 redirects). (Adam)