Dmitry Stogov dd1c68e67f Merge branch 'master' into phpng ... * master: (77 commits) NEWS entry for Fix potential segfault in dns_get_record() NEWS entry for "Fix potential segfault in dns_get_record()" NEWS entry for Fix potential segfault in dns_get_record( Fix potential segfault in dns_get_record() Revert "Add optional second arg to unserialize()" 5.5.15 now update NEWS Fix bug #66127 (Segmentation fault with ArrayObject unset) 5.4.31 next Add NEWS. This doesn't need UPGRADING (or an RFC), IMO. Fix broken test. Add a mime type map generation script and update the header. Move the mime type map out of php_cli_server.c for easier generation. Replace the CLI server's linear search for extensions with a hash table. fix test Remove unused included file NEWS NEWS NEWS Fixed Bug #67413 fileinfo: cdf_read_property_info insufficient boundary chec ... Conflicts: Zend/zend_closures.c Zend/zend_execute.c Zend/zend_vm_def.h Zend/zend_vm_execute.h ext/spl/spl_array.c ext/standard/basic_functions.c ext/standard/dns.c ext/standard/var.c		2014-06-12 05:07:33 +04:00
..
tests	Merge branch 'master' into phpng	2014-06-12 05:07:33 +04: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	- don't show zlib as available when libs or headers are missing	2008-06-22 21:55:59 +00:00
CREDITS	* implement new output API, fixing some bugs and implementing some feature	2010-05-31 10:29:43 +00:00
package.xml	Typo	2007-03-14 09:58:14 +00:00
php_zlib.def	Sync with zlib	2007-04-29 17:47:31 +00:00
php_zlib.h	Bump year	2014-01-03 11:08:10 +08:00
zlib_filter.c	Refactor zlib (all tests pass)	2014-05-05 15:52:09 +08:00
zlib_fopen_wrapper.c	Fixes to various stream cast on win64	2014-03-19 06:33:46 +01:00
zlib_win32_howto.txt
zlib.c	Refactor zlib (all tests pass)	2014-05-05 15:52:09 +08:00
zlib.dsp	revert change #298288: Remove old dsp/dsw/makefile files	2010-04-28 14:41:51 +00:00