Xinchen Hui 672a396d4a Merge branch 'PHP-5.5' into PHP-5.6 ...

Conflicts:
	ext/standard/var_unserializer.c

2015-03-01 23:17:41 +08:00

..

array

Revert "Fix bug #67064 in a BC safe way"

2014-07-30 17:18:05 +02:00

assert

…

class_object

…

dir

…

directory

…

file

Merge branch 'PHP-5.5' into PHP-5.6

2015-02-02 10:52:27 -05:00

filters

…

general_functions

fix tests

2015-02-05 21:54:47 -08:00

http

Merge branch 'PHP-5.5' into PHP-5.6

2014-06-12 18:17:18 -07: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

Add NULL byte protection to exec, system and passthru

2015-02-14 05:25:04 +09:00

network

fix dir separator in test

2015-02-10 16:58:59 +01:00

password

…

serialize

Merge branch 'PHP-5.5' into PHP-5.6

2015-03-01 23:17:41 +08:00

streams

Merge remote-tracking branch 'origin/PHP-5.5' into PHP-5.6

2015-01-26 22:51:37 +01:00

strings

moved the part of the test into an appropriate place

2015-02-08 14:10:52 +01:00

time

…

url

Fixed bug #68129

2014-10-09 08:21:30 +08:00

versioning

…

bug49244.phpt

…

bug64370_var1.phpt

…

bug64370_var2.phpt

…

php_ini_loaded_file.phpt

…