diff options
| author | Anatol Belski <ab@php.net> | 2014-02-05 15:17:30 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-02-05 15:17:30 +0100 |
| commit | 5180425ca9ede2c0178eca64252e4680549fd1e6 (patch) | |
| tree | 1e73cec6e17deefea705f92a8230429372d1c5ed /ext/curl | |
| parent | 3c1ba1f263f8bf367d1da766aa0db05febe200a7 (diff) | |
| parent | fd87b38c4793ee4b5d5509e8bfa962ede8ed5228 (diff) | |
| download | php-git-5180425ca9ede2c0178eca64252e4680549fd1e6.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
adapt test to curl 7.35.0 upgrade
Diffstat (limited to 'ext/curl')
| -rw-r--r-- | ext/curl/tests/bug61948-win32.phpt | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ext/curl/tests/bug61948-win32.phpt b/ext/curl/tests/bug61948-win32.phpt index dc86526b7b..00f498f910 100644 --- a/ext/curl/tests/bug61948-win32.phpt +++ b/ext/curl/tests/bug61948-win32.phpt @@ -17,9 +17,7 @@ open_basedir="c:/tmp" ?> --EXPECTF-- %a - -Warning: curl_setopt(): open_basedir restriction in effect. File(c:/tmp/foo) is not within the allowed path(s): (c:/tmp) in %sbug61948-win32.php on line %d -bool(false) +bool(true) Warning: curl_setopt(): open_basedir restriction in effect. File(c:/xxx/bar) is not within the allowed path(s): (c:/tmp) in %sbug61948-win32.php on line %d bool(false) |