From faeae7ea47bfc7ebe879888f1cd0028006b5f31d Mon Sep 17 00:00:00 2001
From: Ulf Wendel <uw@php.net>
Date: Tue, 6 Sep 2011 12:58:01 +0000
Subject: Reverting to proper --INI-- section usage. Improve SKIPIF to skip
 test if open_basedir setting is too restrictive during test run for whatever
 reason.

---
 ext/mysql/tests/mysql_query_load_data_openbasedir.phpt | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'ext/mysql/tests')

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
-- 
cgit v1.2.1