summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2012-05-06 00:52:51 +0800
committerXinchen Hui <laruence@php.net>2012-05-06 00:52:51 +0800
commit0747b29bdf43be0682d10bdfc788f12f19ccf443 (patch)
tree4f10124872b23046b598860a524591474124accc
parent19632ae7dcdbbb7c34bf0ffde9fb7858f55424cd (diff)
parent4632fe0eefb749da5c6bfdf22beaf2ffa80c3a56 (diff)
downloadphp-git-0747b29bdf43be0682d10bdfc788f12f19ccf443.tar.gz
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3: correct NEWS Fixed bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction) Conflicts: ext/curl/interface.c
-rw-r--r--ext/curl/tests/bug61948.phpt20
1 files changed, 20 insertions, 0 deletions
diff --git a/ext/curl/tests/bug61948.phpt b/ext/curl/tests/bug61948.phpt
new file mode 100644
index 0000000000..a03fc3b600
--- /dev/null
+++ b/ext/curl/tests/bug61948.phpt
@@ -0,0 +1,20 @@
+--TEST--
+Bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction)
+--SKIPIF--
+<?php if (!extension_loaded("curl")) print "skip"; ?>
+--INI--
+open_basedir="/tmp"
+--FILE--
+<?php
+ $ch = curl_init();
+ var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, ""));
+ var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, "/tmp/foo"));
+ var_dump(curl_setopt($ch, CURLOPT_COOKIEFILE, "/xxx/bar"));
+ curl_close($ch);
+?>
+--EXPECTF--
+bool(false)
+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
+bool(false)