Merge branch 'PHP-5.6'

* PHP-5.6: adapt test to curl 7.35.0 upgrade
php · Feb 5, 2014 · b35c788 · b35c788
2 parents ff390d7 + 5180425
commit b35c788
Showing 1 changed file with 1 addition and 3 deletions.
diff --git 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)