summaryrefslogtreecommitdiff
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
commita226fcc15e2aaff2e066d1fc16b2193f63fdfc8b (patch)
tree7b9b309f54834ea2f7bc17a3266ea0362dd23494
parenteea14c09fcf7618e1301d75c6c482b004e92c9e9 (diff)
downloadphp-git-a226fcc15e2aaff2e066d1fc16b2193f63fdfc8b.tar.gz
improve open_basedir handling
-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