Xinchen Hui 91b2ddc816 Merge branch 'master' into phpng ... Conflicts: ext/spl/spl_array.c ext/spl/spl_directory.c ext/standard/formatted_print.c		2014-06-01 22:43:06 +08:00
..
array	Reference counter in phpng may have a bit different meaning and must not be the same	2014-05-28 02:16:21 +04:00
assert
class_object	Fixed tests	2013-12-02 11:53:35 +04:00
dir	All tests passed in ext/standard/tests/dir now	2014-03-09 20:10:02 +08:00
directory
file	Merge mainstream 'master' branch into refactoring	2014-04-26 00:32:51 +04:00
filters
general_functions	Merge mainstream 'master' branch into refactoring	2014-04-26 00:32:51 +04:00
http	Merge branch 'PHP-5.5'	2013-10-01 11:11:48 +02:00
image	Fix bug #67250 (iptcparse out-of-bounds read)	2014-05-11 19:09:19 -07:00
mail	Merge branch 'PHP-5.4' into PHP-5.5	2014-02-28 22:30:21 +08:00
math	Remove XFAIL from a test	2014-02-16 00:07:55 +01:00
misc
network	Merge branch 'PHP-5.4' into PHP-5.5	2014-04-09 19:02:25 +02:00
password
serialize	Merge branch 'PHP-5.5' into PHP-5.6	2014-04-18 15:17:12 +02:00
streams	Merge mainstream 'master' branch into refactoring	2014-04-26 00:32:51 +04:00
strings	Merge branch 'master' into phpng	2014-06-01 22:43:06 +08:00
time	Fix failed test with recent glibc	2013-11-13 13:19:10 +01:00
url	add a test case previously broken by a bad fix	2014-04-24 23:58:38 -07:00
versioning
bug49244.phpt
bug64370_var1.phpt	Backported patch for #64370	2013-03-15 19:04:40 +01:00
bug64370_var2.phpt	Backported patch for #64370	2013-03-15 19:04:40 +01:00
php_ini_loaded_file.phpt