com php-src: Cover have_ssl=NO and have_ssl=DISABLE D: ext/mysqli/tests/bug51647.phpt ext/mysqli/ tests/bug55283.phpt
| From: | Ulf Wendel | Date: | Sat, 29 Sep 2012 16:54:54 +0000 |
| Subject: | com php-src: Cover have_ssl=NO and have_ssl=DISABLE D: ext/mysqli/tests/bug51647.phpt ext/mysqli/ tests/bug55283.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-70401@lists.php.net to get a copy of this message | ||
Commit: da541ff561e0ac6ac72d2efd8b785ecfeef868dc
Author: ULF WENDEL <uw@php.net> Sat, 29 Sep 2012 18:54:54 +0200
Parents: 20e76f4487baf60dc52b348e86bae4628026c4c2
Branches: PHP-5.3 PHP-5.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=da541ff561e0ac6ac72d2efd8b785ecfeef868dc
Log:
Cover have_ssl=NO and have_ssl=DISABLED
Changed paths:
M ext/mysqli/tests/bug51647.phpt
M ext/mysqli/tests/bug55283.phpt
Diff:
diff --git a/ext/mysqli/tests/bug51647.phpt b/ext/mysqli/tests/bug51647.phpt
index b1c1e87..78540f1 100644
--- a/ext/mysqli/tests/bug51647.phpt
+++ b/ext/mysqli/tests/bug51647.phpt
@@ -24,12 +24,12 @@ if ($res = $link->query('SHOW VARIABLES LIKE
"have_ssl"')) {
die(sprintf("skip Failed to test for MySQL SSL support, [%d] %s", $link->errno,
$link->error));
}
}
-
+
if (empty($row))
die(sprintf("skip Failed to test for MySQL SSL support, [%d] %s", $link->errno,
$link->error));
-if ($row[1] == 'NO')
+if (($row[1] == 'NO') || ($row[1] == 'DISABLED'))
die(sprintf("skip MySQL has no SSL support, [%d] %s", $link->errno,
$link->error));
$link->close();
diff --git a/ext/mysqli/tests/bug55283..phpt b/ext/mysqli/tests/bug55283.phpt
index 6000fce..d03daae 100644
--- a/ext/mysqli/tests/bug55283.phpt
+++ b/ext/mysqli/tests/bug55283.phpt
@@ -29,7 +29,7 @@ if ($res = $link->query('SHOW VARIABLES LIKE "have_ssl"'))
{
if (empty($row))
die(sprintf("skip Failed to test for MySQL SSL support, [%d] %s", $link->errno,
$link->error));
-if ($row[1] == 'NO')
+if (($row[1] == 'NO') || ($row[1] == 'DISABLED'))
die(sprintf("skip MySQL has no SSL support, [%d] %s", $link->errno,
$link->error));
$link->close();
@@ -41,7 +41,7 @@ $link->close();
$flags = MYSQLI_CLIENT_SSL;
-
+
$link = mysqli_init();
mysqli_ssl_set($link, null, null, null, null, "RC4-MD5");
if (my_mysqli_real_connect($link, 'p:' . $host, $user, $passwd, $db, $port, null,
$flags)) {