Stanislav Malyshev 5776fceb16 Merge branch 'PHP-5.5' into PHP-5.6 ... * PHP-5.5: (27 commits) fix non-standard C update NEWS 5.4.41 next fix CVE num update NEWS Fix bug #69441 (Buffer Overflow when parsing tar/zip/phar in phar_set_inode) fix test fix type in fix for #69085 fix memory leak & add test Fix tests fix CVE num Fix bug #69337 (php_stream_url_wrap_http_ex() type-confusion vulnerability) Fix test Additional fix for bug #69324 More fixes for bug #69152 Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions) Fixed bug #69324 (Buffer Over-read in unserialize when parsing Phar) Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER) Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4) Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault) ... Conflicts: ext/standard/http_fopen_wrapper.c		2015-04-14 01:05:01 -07:00
..
tests	Merge branch 'PHP-5.5' into PHP-5.6	2015-04-14 01:05:01 -07:00
config0.m4	Fix long-standing visual pain point: the misalignment of './configure help' text.	2013-08-06 11:06:09 -07:00
config.w32
CREDITS
package.xml
php_zlib.def
php_zlib.h	bump year	2015-01-15 23:26:37 +08:00
zlib_filter.c	bump year	2015-01-15 23:26:37 +08:00
zlib_fopen_wrapper.c	bump year	2015-01-15 23:26:37 +08:00
zlib_win32_howto.txt	typo fixes - https://github.com/vlajos/misspell_fixer	2014-11-23 14:33:43 -08:00
zlib.c	Merge branch 'PHP-5.4.40' into PHP-5.5.24	2015-04-11 16:56:12 -07:00
zlib.dsp