diff options
| author | Anatol Belski <ab@php.net> | 2013-02-19 09:04:52 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2013-02-19 09:04:52 +0100 |
| commit | cc34dfce16475ce63c2e987b9a111c37c2cfa19c (patch) | |
| tree | 4518561527fedb36afd5d68515ba20cf2c75670c | |
| parent | 42437dd870de28eee6c9127f4c7e7c78ba8e0152 (diff) | |
| parent | 558c5dbe655ffe13d27c47fa02e108302a7dfe73 (diff) | |
| download | php-git-cc34dfce16475ce63c2e987b9a111c37c2cfa19c.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
fix the test for curl 7.29.0+
| -rw-r--r-- | ext/curl/tests/curl_error_basic.phpt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/curl/tests/curl_error_basic.phpt b/ext/curl/tests/curl_error_basic.phpt index bd01847f00..3d3502306a 100644 --- a/ext/curl/tests/curl_error_basic.phpt +++ b/ext/curl/tests/curl_error_basic.phpt @@ -38,4 +38,4 @@ curl_close($ch); ?> --EXPECTF-- == Testing curl_error with a fake URL == -string(%d) "%sfakeURL%s" +string(%d) "%sfakeURL%S" |