summaryrefslogtreecommitdiff
path: root/ext/mysql/tests
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2011-09-06 19:51:35 +0000
committerStanislav Malyshev <stas@php.net>2011-09-06 19:51:35 +0000
commit6577512462e8eba2b734b0a5004b2f0f95951d9a (patch)
treef0a6e7a3e568c495fc1ed679bfe6ddd6b29ffa4d /ext/mysql/tests
parent82b14d2f864ac6f7c263b46647c56a94da56ab35 (diff)
downloadphp-git-6577512462e8eba2b734b0a5004b2f0f95951d9a.tar.gz
improve open_basedir handling
Diffstat (limited to 'ext/mysql/tests')
-rw-r--r--ext/mysql/tests/mysql_query_load_data_openbasedir.phpt10
1 files changed, 2 insertions, 8 deletions
diff --git a/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt b/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt
index c2685a572e..339d36c934 100644
--- a/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt
+++ b/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt
@@ -3,11 +3,6 @@ LOAD DATA INFILE - open_basedir
--SKIPIF--
<?php
@include_once("connect.inc");
-
-if (!isset($db)) {
- die("skip open_basedir setting prevents inclusing of required files");
-}
-
include_once('skipif.inc');
include_once('skipifconnectfailure.inc');
@@ -31,12 +26,11 @@ if ($socket == "" && $host != NULL && $host != 'localhost' && $host != '.') {
}
}
?>
---INI--
-open_basedir="."
--FILE--
<?php
@include_once("connect.inc");
-
+ini_set("open_basedir", __DIR__);
+chdir(__DIR__);
if (!isset($db)) {
// run-tests, I love you for not allowing me to set ini settings dynamically
print "[006] [1148] The used command is not allowed with this MySQL version