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	Fix bug #67392: token_name() does not return name for T_POW and T_POW_EQUAL token	2014-06-07 15:27:54 +02:00
config.m4	- MFH: Use a script to generate tokenizer data from zend_language_parser.h	2007-07-31 23:24:11 +00:00
config.w32	- fix win32 build	2007-08-01 15:13:40 +00:00
CREDITS	- MFH: Use a script to generate tokenizer data from zend_language_parser.h	2007-07-31 23:24:11 +00:00
Makefile.frag	MFH: fix tokenizer makefile dependencies on parser/scanner files when built dynamically. (See bug #38762)	2009-03-02 03:54:04 +00:00
package.xml	Typo	2007-03-14 09:58:14 +00:00
php_tokenizer.h	Bump year	2014-01-03 11:08:10 +08:00
tokenizer_data_gen.sh	Bump year	2014-01-03 11:08:10 +08:00
tokenizer_data.c	use ./tokenizer_data_gen.sh to for adding T_POW & T_POW_EQUAL	2014-06-08 00:01:01 +02:00
tokenizer.c	Cleanup (1-st round)	2014-04-15 15:40:40 +04:00
tokenizer.dsp	revert change #298288: Remove old dsp/dsw/makefile files	2010-04-28 14:41:51 +00:00
tokenizer.php