diff options
| author | Ulf Wendel <uw@php.net> | 2011-09-06 12:58:01 +0000 |
|---|---|---|
| committer | Ulf Wendel <uw@php.net> | 2011-09-06 12:58:01 +0000 |
| commit | 1a53d78b0c0042cf0887f23f06d5c8b6325fb70c (patch) | |
| tree | 70b618170d5c38992af2c454c77e9dfa232f1789 | |
| parent | f7f2c8c209d9ff32f04d2c841287e2eaca2fbb41 (diff) | |
| download | php-git-1a53d78b0c0042cf0887f23f06d5c8b6325fb70c.tar.gz | |
Reverting to proper --INI-- section usage. Improve SKIPIF to skip test if open_basedir setting is too restrictive during test run for whatever reason.
| -rw-r--r-- | ext/mysql/tests/mysql_query_load_data_openbasedir.phpt | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt b/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt index 90849d1c8f..c2685a572e 100644 --- a/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt +++ b/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt @@ -2,9 +2,15 @@ LOAD DATA INFILE - open_basedir --SKIPIF-- <?php -require_once('skipif.inc'); -require_once('skipifconnectfailure.inc'); -require_once("connect.inc"); +@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'); + if (!$IS_MYSQLND) die("skip mysqlnd only, libmysql does not know about open_basedir restrictions"); @@ -25,10 +31,12 @@ if ($socket == "" && $host != NULL && $host != 'localhost' && $host != '.') { } } ?> +--INI-- +open_basedir="." --FILE-- <?php @include_once("connect.inc"); -ini_set("open_basedir", __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 |