uw Tue, 06 Sep 2011 13:50:45 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=316259
Log:
Fix SKIPIF
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_autocommit_oo.phpt
U
php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_openbasedir.phpt
U php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_autocommit_oo.phpt
U
php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_set_local_infile_handler_openbasedir.phpt
U php/php-src/trunk/ext/mysqli/tests/mysqli_autocommit_oo.phpt
U
php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_openbasedir.phpt
Modified:
php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_autocommit_oo.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_autocommit_oo.phpt
2011-09-06 13:40:46 UTC (rev 316258)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_autocommit_oo.phpt
2011-09-06 13:50:45 UTC (rev 316259)
@@ -7,7 +7,7 @@
require_once('skipifconnectfailure.inc');
require_once('connect.inc');
- if (!$mysqli = new my_mysqli($host, $user, $passwd, $db, $port,
$socket)) {
+ if (!$link = new my_mysqli($host, $user, $passwd, $db, $port, $socket))
{
printf("skip Cannot connect to the server using host=%s,
user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
$host, $user, $db, $port, $socket);
exit(1);
Modified:
php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_openbasedir.phpt
===================================================================
---
php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_openbasedir.phpt
2011-09-06 13:40:46 UTC (rev 316258)
+++
php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_local_infile_handler_openbasedir.phpt
2011-09-06 13:50:45 UTC (rev 316259)
@@ -2,14 +2,17 @@
mysqli_set_local_infile_handler() - open basedir restrictions
--SKIPIF--
<?php
-require_once('skipif.inc');
-require_once('skipifemb.inc');
-require_once('skipifconnectfailure.inc');
+if (!$fp = @fopen('skipif.inc', 'r'))
+ die("skip open_basedir restrictions forbid opening include files");
+include_once('skipif.inc');
+include_once('skipifemb.inc');
+include_once('skipifconnectfailure.inc');
+
if (!function_exists('mysqli_set_local_infile_handler'))
die("skip - function not available.");
-require_once('connect.inc');
+include_once('connect.inc');
if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
die("skip Cannot connect to MySQL");
Modified:
php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_autocommit_oo.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_autocommit_oo.phpt
2011-09-06 13:40:46 UTC (rev 316258)
+++ php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_autocommit_oo.phpt
2011-09-06 13:50:45 UTC (rev 316259)
@@ -7,7 +7,7 @@
require_once('skipifconnectfailure.inc');
require_once('connect.inc');
- if (!$mysqli = new my_mysqli($host, $user, $passwd, $db, $port,
$socket)) {
+ if (!$link = new my_mysqli($host, $user, $passwd, $db, $port, $socket))
{
printf("skip Cannot connect to the server using host=%s,
user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
$host, $user, $db, $port, $socket);
exit(1);
Modified:
php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_set_local_infile_handler_openbasedir.phpt
===================================================================
---
php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_set_local_infile_handler_openbasedir.phpt
2011-09-06 13:40:46 UTC (rev 316258)
+++
php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_set_local_infile_handler_openbasedir.phpt
2011-09-06 13:50:45 UTC (rev 316259)
@@ -2,14 +2,17 @@
mysqli_set_local_infile_handler() - open basedir restrictions
--SKIPIF--
<?php
-require_once('skipif.inc');
-require_once('skipifemb.inc');
-require_once('skipifconnectfailure.inc');
+if (!$fp = @fopen('skipif.inc', 'r'))
+ die("skip open_basedir restrictions forbid opening include files");
+include_once('skipif.inc');
+include_once('skipifemb.inc');
+include_once('skipifconnectfailure.inc');
+
if (!function_exists('mysqli_set_local_infile_handler'))
die("skip - function not available.");
-require_once('connect.inc');
+include_once('connect.inc');
if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
die("skip Cannot connect to MySQL");
Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_autocommit_oo.phpt
===================================================================
--- php/php-src/trunk/ext/mysqli/tests/mysqli_autocommit_oo.phpt
2011-09-06 13:40:46 UTC (rev 316258)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_autocommit_oo.phpt
2011-09-06 13:50:45 UTC (rev 316259)
@@ -7,7 +7,7 @@
require_once('skipifconnectfailure.inc');
require_once('connect.inc');
- if (!$mysqli = new my_mysqli($host, $user, $passwd, $db, $port,
$socket)) {
+ if (!$link = new my_mysqli($host, $user, $passwd, $db, $port, $socket))
{
printf("skip Cannot connect to the server using host=%s,
user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
$host, $user, $db, $port, $socket);
exit(1);
Modified:
php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_openbasedir.phpt
===================================================================
---
php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_openbasedir.phpt
2011-09-06 13:40:46 UTC (rev 316258)
+++
php/php-src/trunk/ext/mysqli/tests/mysqli_set_local_infile_handler_openbasedir.phpt
2011-09-06 13:50:45 UTC (rev 316259)
@@ -2,14 +2,17 @@
mysqli_set_local_infile_handler() - open basedir restrictions
--SKIPIF--
<?php
-require_once('skipif.inc');
-require_once('skipifemb.inc');
-require_once('skipifconnectfailure.inc');
+if (!$fp = @fopen('skipif.inc', 'r'))
+ die("skip open_basedir restrictions forbid opening include files");
+include_once('skipif.inc');
+include_once('skipifemb.inc');
+include_once('skipifconnectfailure.inc');
+
if (!function_exists('mysqli_set_local_infile_handler'))
die("skip - function not available.");
-require_once('connect.inc');
+include_once('connect.inc');
if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
die("skip Cannot connect to MySQL");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
