diff options
| author | Xinchen Hui <laruence@php.net> | 2012-07-09 08:38:03 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2012-07-09 08:38:03 +0800 |
| commit | 0398cc22a9fda50ad9ba0fb2d717f07a711e1732 (patch) | |
| tree | 0fb346622b3813c73a943e219c2909cbc2c6fa15 | |
| parent | 5910d8d4f499bf84bcaa1161bd0b89c15a19a304 (diff) | |
| parent | c819cf9d6bd43d79b894f1d0f0c6c282893fd9bd (diff) | |
| download | php-git-0398cc22a9fda50ad9ba0fb2d717f07a711e1732.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fixed bug #62499 (curl_setopt($ch, CURLOPT_COOKIEFILE, "") returns false)
appease MSVC (doesnt like unary minus of unsigned ints)
Conflicts:
ext/curl/interface.c
| -rw-r--r-- | ext/curl/interface.c | 2 | ||||
| -rw-r--r-- | ext/curl/tests/bug61948.phpt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/curl/interface.c b/ext/curl/interface.c index b03f346b59..d7d5c51c4d 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -2177,7 +2177,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; } diff --git a/ext/curl/tests/bug61948.phpt b/ext/curl/tests/bug61948.phpt index 23bbda7d5f..00df07d73e 100644 --- a/ext/curl/tests/bug61948.phpt +++ b/ext/curl/tests/bug61948.phpt @@ -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 |