php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-26 09:28:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.4'

Browse Source 
* PHP-5.4:
  update NEWS
  Fixed bug #62499 (curl_setopt($ch, CURLOPT_COOKIEFILE, "") returns false)
  appease MSVC (doesnt like unary minus of unsigned ints)
  appease MSVC (doesnt like unary minus of unsigned ints)
This commit is contained in:
Xinchen Hui
2012-07-09 08:46:38 +08:00
parent e6d9cd983b 4323a7aced
commit 0e97cdf86b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/curl/interface.c
+1 -1
View File
@@ -2647,7 +2647,7 @@ string_copy:
convert_to_string_ex(zvalue);
if (!Z_STRLEN_PP(zvalue) || php_check_open_basedir(Z_STRVAL_PP(zvalue) TSRMLS_CC)) {
if (Z_STRLEN_PP(zvalue) && php_check_open_basedir(Z_STRVAL_PP(zvalue) TSRMLS_CC)) {
RETVAL_FALSE;
return 1;
}
ext/curl/tests/bug61948.phpt
+1 -1
View File
@@ -16,7 +16,7 @@ open_basedir="/tmp"
curl_close($ch);
?>
--EXPECTF--
bool(false)
bool(true)
bool(true)
Warning: curl_setopt(): open_basedir restriction in effect. File(/xxx/bar) is not within the allowed path(s): (/tmp) in %sbug61948.php on line %d