com php-src: Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport: ext/spl/s pl_array.c ext/spl/spl_directory.c
ext/spl/spl_it erators.c ext/standard/formatted_print.c
| From: | Anatol Belski | Date: | Mon, 02 Jun 2014 06:42:24 +0000 |
| Subject: | com php-src: Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport: ext/spl/s pl_array.c ext/spl/spl_directory.c ext/spl/spl_it erators.c ext/standard/formatted_print.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-78713@lists.php.net to get a copy of this message | ||
Commit: 5cd607d1a7ffa985a4f6e29ecbfad9f1ede644fa
Author: Anatol Belski <ab@php.net> Mon, 2 Jun 2014 08:42:24 +0200
Parents: 4796204a4cef2a8d5378d142670592fd44eec403 f41ab36e5cd6a2e41ca13d1bd8ee922c42e5bb27
Branches: str_size_and_int64_56_backport
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5cd607d1a7ffa985a4f6e29ecbfad9f1ede644fa
Log:
Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
Update NEWs
Update NEWs
Fixed bug #67359 (Segfault in recursiveDirectoryIterator)
Check for zero-length keys in spl_array_skip_protected and don't skip them.
added CVEs in NEWS
updated libmagic.patch for 5.6+
updated libmagic.patch for 5.4+
update NEWS
Fix bug #67249: printf out-of-bounds read
5.5.13 release date
Conflicts:
ext/standard/formatted_print.c
Bugs:
https://bugs.php.net/67359
https://bugs.php.net/67249
Changed paths:
MM ext/spl/spl_array.c
MM ext/spl/spl_directory.c
MM ext/spl/spl_iterators.c
MM ext/standard/formatted_print.c
Diff: