Yasuo Ohgaki feef180e6c Merge branch 'PHP-5.6' ...

* PHP-5.6:
  Fixed Bug #67988 htmlspecialchars() does not respect default_charset specified by ini_set.

Conflicts:
	main/main.c
	tests/basic/encoding.phpt

2015-02-03 19:00:13 +09:00

..

basic

Merge branch 'PHP-5.6'

2015-02-03 19:00:13 +09:00

classes

Remove assignment of new by reference

2015-01-26 21:00:22 +01:00

func

test to function addcslashes

2014-11-23 17:19:56 -08:00

lang

Remove preg_replace /e modifier

2015-01-26 21:00:23 +01:00

output

Fix tests I broke with the E_ERROR > E_RECOVERABLE_ERROR change

2014-12-29 07:54:44 +01:00

run-test

Use "float" and "integer" in typehint and zpp errors

2014-12-21 13:23:02 +00:00

security

fix these tests so they properly clean up after themselves.

2014-01-20 18:04:35 +01:00

strings

Fix tests expecting specific resource IDs

2013-12-15 16:51:21 +08:00

quicktester.inc

- Fixed the bz2 tests. (and changed the usage comment to be correct)

2002-03-20 02:16:34 +00:00