summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2014-11-05 15:43:37 +0100
committerAnatol Belski <ab@php.net>2014-11-05 15:43:37 +0100
commit4b8cc567cd6a0c8717bf24f5f1abc2a34b711462 (patch)
tree4bcfec39854f762115d20acabb2523ada5299021
parent90b4ec51adad6791b508d65b81e45233d687c23f (diff)
parentd4050f42fd89e30a4efb2bda5845dae51e7dc87a (diff)
downloadphp-git-4b8cc567cd6a0c8717bf24f5f1abc2a34b711462.tar.gz
Merge branch 'PHP-5.6'
* PHP-5.6: fix dir separator in test
-rw-r--r--ext/curl/tests/bug68089.phpt2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/curl/tests/bug68089.phpt b/ext/curl/tests/bug68089.phpt
index 3bd5889709..d65441b2cc 100644
--- a/ext/curl/tests/bug68089.phpt
+++ b/ext/curl/tests/bug68089.phpt
@@ -13,6 +13,6 @@ var_dump(curl_setopt($ch, CURLOPT_URL, $url));
?>
Done
--EXPECTF--
-Warning: curl_setopt(): Curl option contains invalid characters (\0) in %s/bug68089.php on line 4
+Warning: curl_setopt(): Curl option contains invalid characters (\0) in %s%ebug68089.php on line 4
bool(false)
Done