summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2019-05-22 12:03:10 +0200
committerChristoph M. Becker <cmbecker69@gmx.de>2019-05-22 12:03:10 +0200
commit5193e5c405aa9646487623c191c56b26347f699f (patch)
tree68c4996236a9b7c871bb207d3b62a148bce04024
parent224353a18f2e2621f76f272925eba06933b857b7 (diff)
parent21bf9b0f4cba9292533db4a065639d314b4fcf84 (diff)
downloadphp-git-5193e5c405aa9646487623c191c56b26347f699f.tar.gz
Merge branch 'PHP-7.4'
* PHP-7.4: Fix test case for cURL 7.65.0
-rw-r--r--ext/curl/tests/curl_basic_010.phpt2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/curl/tests/curl_basic_010.phpt b/ext/curl/tests/curl_basic_010.phpt
index 20bcc59be6..13fbd0c404 100644
--- a/ext/curl/tests/curl_basic_010.phpt
+++ b/ext/curl/tests/curl_basic_010.phpt
@@ -26,5 +26,5 @@ curl_close($ch);
?>
--EXPECTF--
-string(%d) "%r(Couldn't resolve proxy|Could not resolve proxy:|Could not resolve host:|Could not resolve:)%r %s"
+string(%d) "%r(Couldn't resolve proxy|Could not resolve proxy:|Could not resolve host:|Could not resolve:|Unsupported proxy syntax in)%r %s"
int(5)