summaryrefslogtreecommitdiff
path: root/sapi/cli
diff options
context:
space:
mode:
authorRasmus Lerdorf <rasmus@lerdorf.com>2018-10-31 11:41:42 -0700
committerRasmus Lerdorf <rasmus@lerdorf.com>2018-10-31 11:41:42 -0700
commitb91690c8922c13c9e4d6b8eb7252e7545979e086 (patch)
treef7abe76a9b107379790d609885de13670b48e824 /sapi/cli
parent46b25ee2a97ac12a9acf8fba11eaee1289b8ec11 (diff)
parent99a9e85c65bb01d8254557a7685f25b6b26ef111 (diff)
downloadphp-git-b91690c8922c13c9e4d6b8eb7252e7545979e086.tar.gz
Merge branch 'PHP-7.3'
* PHP-7.3: Fix stray newline that caused this test to fail
Diffstat (limited to 'sapi/cli')
-rw-r--r--sapi/cli/tests/upload_2G.phpt1
1 files changed, 0 insertions, 1 deletions
diff --git a/sapi/cli/tests/upload_2G.phpt b/sapi/cli/tests/upload_2G.phpt
index 21dacb439a..34e3a7c288 100644
--- a/sapi/cli/tests/upload_2G.phpt
+++ b/sapi/cli/tests/upload_2G.phpt
@@ -78,7 +78,6 @@ fclose($fp);
Done
--EXPECTF--
Test
-
HTTP/1.1 200 OK
Host: %s
Date: %s