Merge branch 'PHP-5.3' into PHP-5.4

Conflicts:
	ext/standard/tests/general_functions/bug60723.phpt
This commit is contained in:
Xinchen Hui 2012-09-24 11:00:58 +08:00
commit d9ad532050

View file

@ -9,9 +9,11 @@ $dir = dirname(__FILE__);
$log = $dir . "/tmp.err"; $log = $dir . "/tmp.err";
ini_set("error_log", $log); ini_set("error_log", $log);
echo $aa; echo $aa;
error_log("dummy");
readfile($log); readfile($log);
unlink($log); unlink($log);
?> ?>
--EXPECTF-- --EXPECTF--
Notice: Undefined variable: aa in %sbug60723.php on line %d Notice: Undefined variable: aa in %sbug60723.php on line %d
[%s ASIA/Chongqing] PHP Notice: Undefined variable: aa in %sbug60723.php on line %d [%s ASIA/Chongqing] PHP Notice: Undefined variable: aa in %sbug60723.php on line %d
[%s ASIA/Chongqing] dummy