diff options
| author | Anatol Belski <ab@php.net> | 2014-11-05 15:43:13 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-11-05 15:43:13 +0100 |
| commit | d4050f42fd89e30a4efb2bda5845dae51e7dc87a (patch) | |
| tree | 898b784a21f6b35698ba79a1070a1758dd76256d | |
| parent | 342d56b23d05dcafa5019efc401a78592d823b49 (diff) | |
| parent | 53266476e63608e4ce03c6d584864755806b28fe (diff) | |
| download | php-git-d4050f42fd89e30a4efb2bda5845dae51e7dc87a.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix dir separator in test
| -rw-r--r-- | ext/curl/tests/bug68089.phpt | 2 |
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 |