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	Remove superfluous echos.	2014-06-08 13:50:22 -07:00
config.m4
config.w32	- do not enable an ext when a lib/header fails	2008-06-23 18:40:29 +00:00
CREDITS
example.php
exif.c	fix exif, thnx laruence	2014-05-07 12:03:00 +01:00
exif.dsp	revert change #298288: Remove old dsp/dsw/makefile files	2010-04-28 14:41:51 +00:00
package.xml	Typo	2007-03-14 09:58:14 +00:00
php_exif.h	Bump year	2014-01-03 11:08:10 +08:00
test.php
test.txt