Skip to content

Commit ec0678e

Browse files
committed
fixes on mysqli, openssl, readline tests
1 parent 4a98b36 commit ec0678e

File tree

5 files changed

+9
-7
lines changed

5 files changed

+9
-7
lines changed

ext/mysqli/tests/bug77956.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,6 @@ if (!$link->query('DROP TABLE IF EXISTS test')) {
5656
$link->close();
5757
unlink('bug77956.data');
5858
?>
59-
--EXPECT--
60-
[006] [2000] LOAD DATA LOCAL INFILE is forbidden, check related settings like mysqli.allow_local_infile|mysqli.local_infile_directory or PDO::MYSQL_ATTR_LOCAL_INFILE|PDO::MYSQL_ATTR_LOCAL_INFILE_DIRECTORY
59+
--EXPECTF--
60+
[006] [%d] LOAD DATA LOCAL INFILE is forbidden, check related settings like mysqli.allow_local_infile|mysqli.local_infile_directory or PDO::MYSQL_ATTR_LOCAL_INFILE|PDO::MYSQL_ATTR_LOCAL_INFILE_DIRECTORY
6161
done

ext/mysqli/tests/mysqli_fetch_assoc_no_alias_utf8.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ mysqli
99
if (!$link = @mysqli_connect($host, $user, $passwd, $db, $port, $socket))
1010
die(sprintf("skip Can't connect to MySQL Server - [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
1111

12-
if (!$res = mysqli_query($link, "SHOW CHARACTER SET LIKE 'UTF8'"))
12+
if (!$res = mysqli_query($link, "SHOW CHARACTER SET LIKE '%UTF8%'"))
1313
die("skip Cannot run SHOW CHARACTER SET to check charsets");
1414

1515
if (!$tmp = mysqli_fetch_assoc($res))
1616
die("skip Looks like UTF8 is not available on the server");
1717

18-
if (strtolower($tmp['Charset']) !== 'utf8')
18+
if (strtolower($tmp['Charset']) !== 'utf8' && strtolower($tmp['Charset']) !== 'utf8mb3')
1919
die("skip Not sure if UTF8 is available, canceling the test");
2020

2121
mysqli_free_result($res);

ext/openssl/tests/bug70438.phpt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ Request #70438: Add IV parameter for openssl_seal and openssl_open
44
openssl
55
--SKIPIF--
66
<?php
7-
if (!in_array('AES-128-CBC', openssl_get_cipher_methods(true))) {
7+
if (!in_array('AES-128-CBC', openssl_get_cipher_methods(true)) &&
8+
!in_array('aes-128-cbc', openssl_get_cipher_methods(true))) {
89
print "skip";
910
}
1011
?>

ext/openssl/tests/bug74402.phpt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ Bug #74402 (segfault on random_bytes, bin3hex, openssl_seal)
44
openssl
55
--SKIPIF--
66
<?php
7-
if (!in_array('AES256', openssl_get_cipher_methods(true))) print "skip";
7+
if (!in_array('AES256', openssl_get_cipher_methods(true)) &&
8+
!in_array('aes256', openssl_get_cipher_methods(true))) print "skip";
89
?>
910
--FILE--
1011
<?php

ext/readline/tests/readline_read_history_error_001.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Pedro Manoel Evangelista <pedro.evangelista at gmail dot com>
55
--EXTENSIONS--
66
readline
77
--SKIPIF--
8-
<?php if (!READLINE_LIB != "libedit") die('skip READLINE_LIB != "libedit"'); ?>
8+
<?php if (READLINE_LIB != "libedit") die('skip READLINE_LIB != "libedit"'); ?>
99
--FILE--
1010
<?php
1111
var_dump(readline_read_history('nofile'));

0 commit comments

Comments
 (0)