On Tue, Apr 27, 2010 at 01:55, Kalle Sommer Nielsen <ka...@php.net> wrote: > kalle Mon, 26 Apr 2010 23:55:03 +0000 > > Revision: http://svn.php.net/viewvc?view=revision&revision=298626 > > Log: > Merge safe_mode changes into extensions that are in sync in both branches > > Changed paths: > U php/php-src/branches/PHP_5_3/ext/enchant/enchant.c > U php/php-src/branches/PHP_5_3/ext/fileinfo/fileinfo.c > U php/php-src/branches/PHP_5_3/ext/fileinfo/libmagic/apprentice.c > U php/php-src/branches/PHP_5_3/ext/fileinfo/libmagic/cdf.c > U php/php-src/branches/PHP_5_3/ext/fileinfo/libmagic/cdf.h > U php/php-src/branches/PHP_5_3/ext/fileinfo/libmagic/magic.c > U php/php-src/branches/PHP_5_3/ext/fileinfo/libmagic/readcdf.c > U php/php-src/branches/PHP_5_3/ext/fileinfo/libmagic.patch > U php/php-src/branches/PHP_5_3/ext/mysql/php_mysql.c > U > php/php-src/branches/PHP_5_3/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt > U php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c > U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_net.c > U php/php-src/branches/PHP_5_3/ext/pdo_mysql/mysql_driver.c > U php/php-src/branches/PHP_5_3/ext/phar/phar.c > U php/php-src/branches/PHP_5_3/ext/phar/phar_object.c > U php/php-src/branches/PHP_5_3/ext/phar/util.c > U php/php-src/branches/PHP_5_3/ext/sqlite3/sqlite3.c > U php/php-src/branches/PHP_5_3/ext/sqlite3/tests/sqlite3_21_security.phpt > U php/php-src/branches/PHP_5_3/ext/zip/php_zip.c > U php/php-src/branches/PHP_5_3/ext/zip/php_zip.h > U php/php-src/branches/PHP_5_3/ext/zip/zip_stream.c > >
Modified: php/php-src/branches/PHP_5_3/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt 2010-04-26 23:53:30 UTC (rev 298625) +++ php/php-src/branches/PHP_5_3/ext/mysql/tests/mysql_query_load_data_openbasedir.phpt 2010-04-26 23:55:03 UTC (rev 298626) @@ -26,7 +26,6 @@ } ?> --INI-- -safe_mode=0 open_basedir="." --FILE-- <?php Wont this break the test? -Hannes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php