summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2015-01-27 22:20:17 +0800
committerXinchen Hui <laruence@php.net>2015-01-27 22:20:17 +0800
commit737b6f69e366dcc386f66f9626d2583e809e2bc6 (patch)
treeeea3017185df1876d3e3bfca240025a9eb79c7a4
parent9fdf62d64aa08d0c62833ee34e54056baffc2730 (diff)
parent92d56b0af6e000d477a020fdcb07ddb5e98713b1 (diff)
downloadphp-git-737b6f69e366dcc386f66f9626d2583e809e2bc6.tar.gz
Merge branch 'PHP-5.6'
-rw-r--r--sapi/tests/test006.phpt1
1 files changed, 1 insertions, 0 deletions
diff --git a/sapi/tests/test006.phpt b/sapi/tests/test006.phpt
index 5cb211856b..45e37811ef 100644
--- a/sapi/tests/test006.phpt
+++ b/sapi/tests/test006.phpt
@@ -43,6 +43,7 @@ Content-Type: application/octet-stream
phpinfo();
?>
-----------------------------240723202011929--
+
--FILE--
<?php
error_reporting(0);