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
..
aolserver	Cleanup (1-st round)	2014-04-15 15:40:40 +04:00
apache	Added support for apache and apache2handler SAPIs (They seem slower than FastCGI)	2014-05-06 13:26:23 +04:00
apache2filter	fix hash API calls	2014-05-17 08:12:18 +02:00
apache2handler	Added support for apache and apache2handler SAPIs (They seem slower than FastCGI)	2014-05-06 13:26:23 +04:00
apache_hooks	Cleanup (1-st round)	2014-04-15 15:40:40 +04:00
caudium	Merge branch 'PHP-5.6'	2014-01-03 11:09:07 +08:00
cgi	Fixed apply_func_t (they should be broken before)	2014-05-25 18:32:35 +08:00
cli	Merge branch 'master' into phpng	2014-06-12 05:07:33 +04:00
continuity	Merge branch 'PHP-5.6'	2014-01-03 11:09:07 +08:00
embed	Merge branch 'PHP-5.6'	2014-03-24 10:32:07 +01:00
fpm	There should been memory leaks(and don't use pointer cast)	2014-05-08 15:20:13 +08:00
isapi	Bump year	2014-01-03 11:08:10 +08:00
litespeed	Merge mainstream 'master' branch into refactoring	2014-04-26 00:32:51 +04:00
milter	Cleanup (1-st round)	2014-04-15 15:40:40 +04:00
nsapi	Cleanup (1-st round)	2014-04-15 15:40:40 +04:00
phpdbg	Merge sapi/phpdbg into PHP-5.6	2014-06-09 10:06:29 +02:00
phttpd	Bump year	2014-01-03 11:08:10 +08:00
pi3web	Merge branch 'PHP-5.6'	2014-01-03 11:09:07 +08:00
roxen	Merge branch 'PHP-5.6'	2014-01-03 11:09:07 +08:00
tests	- Rewrite scanner to be based on re2c instead of flex	2008-03-16 21:06:55 +00:00
thttpd	Merge branch 'PHP-5.6'	2014-01-03 11:09:07 +08:00
tux	Merge branch 'PHP-5.6'	2014-01-03 11:09:07 +08:00
webjames	Bump year	2014-01-03 11:08:10 +08:00