[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt trunk/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt

[Stanislav Malyshev]

stas                                     Tue, 06 Sep 2011 19:51:35 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=316288

Log:
improve open_basedir handling

Changed paths:
    U   
php/php-src/branches/PHP_5_4/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt
    U   php/php-src/trunk/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt

Modified: 
php/php-src/branches/PHP_5_4/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt
===================================================================
--- 
php/php-src/branches/PHP_5_4/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt
 2011-09-06 18:09:16 UTC (rev 316287)
+++ 
php/php-src/branches/PHP_5_4/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt
 2011-09-06 19:51:35 UTC (rev 316288)
@@ -3,11 +3,6 @@
 --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 @@
        }
 }
 ?>
---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

Modified: 
php/php-src/trunk/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt
===================================================================
--- php/php-src/trunk/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt    
2011-09-06 18:09:16 UTC (rev 316287)
+++ php/php-src/trunk/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt    
2011-09-06 19:51:35 UTC (rev 316288)
@@ -3,11 +3,6 @@
 --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 @@
        }
 }
 ?>
---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


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php