summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2012-05-06 00:50:37 +0800
committerXinchen Hui <laruence@php.net>2012-05-06 00:50:37 +0800
commit19632ae7dcdbbb7c34bf0ffde9fb7858f55424cd (patch)
tree81bd3b69a7681ef5d6d35365d0af3d8f2a47d938
parent948ab62c253de1460ca91874cb209961cad7bdd9 (diff)
downloadphp-git-19632ae7dcdbbb7c34bf0ffde9fb7858f55424cd.tar.gz
Fixed bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction)
-rw-r--r--NEWS4
-rw-r--r--ext/curl/interface.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 9ef6abf66f..8b82237849 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,10 @@ PHP NEWS
bug #61785 (Memory leak when access a non-exists file without router).
(Laruence)
+- CURL:
+ . Fixed bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction).
+ (Laruence)
+
- Core:
. Fixed bug #61922 (ZTS build doesn't accept zend.script_encoding config).
(Laruence)
diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index b359952a8b..b03f346b59 100644
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -2177,7 +2177,7 @@ string_copy:
convert_to_string_ex(zvalue);
- if (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;
}