diff options
| author | ULF WENDEL <uw@php.net> | 2012-09-29 18:56:30 +0200 |
|---|---|---|
| committer | ULF WENDEL <uw@php.net> | 2012-09-29 18:56:30 +0200 |
| commit | 1fafc9b373be2bb17c6dd9f61f307d39c58881ff (patch) | |
| tree | c8bba27666bd1a3f5a3bd2fcc35abc2ded26b4bd | |
| parent | c36981efdb98112603973772a82d02f788e01050 (diff) | |
| parent | 7aa3d0ae658d3eb386915311929c48ba300b8493 (diff) | |
| download | php-git-1fafc9b373be2bb17c6dd9f61f307d39c58881ff.tar.gz | |
Merge branch 'PHP-5.4'
* PHP-5.4:
Cover have_ssl=NO and have_ssl=DISABLED
| -rw-r--r-- | ext/mysqli/tests/bug51647.phpt | 4 | ||||
| -rw-r--r-- | ext/mysqli/tests/bug55283.phpt | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ext/mysqli/tests/bug51647.phpt b/ext/mysqli/tests/bug51647.phpt index b1c1e87a77..78540f1c33 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 6000fce0a9..d03daaee88 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)) { |