gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'QA_4_7'

Browse Source
This commit is contained in:
Michal Čihař 2017-07-18 13:28:11 +02:00
commit 7cc0ae9acb
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -39,6 +39,7 @@ phpMyAdmin - ChangeLog
- issue #13489 Fixed rendering SQL lint errors
- issue #13468 Avoid breakage if set_time_limit is disabled
- issue #13471 Fail if ini_set/ini_get are disabled
- issue #13436 Automatically connect using SSL when server is configured so
4.7.2 (2017-06-29)
- issue #13314 Make theme selection keep current server

28
libraries/classes/Dbi/DbiMysqli.php
View File

@ -95,11 +95,11 @@ class DbiMysqli implements DbiExtension
/* Optionally enable SSL */
if ($server['ssl']) {
$client_flags |= MYSQLI_CLIENT_SSL;
if (! is_null($server['ssl_key']) ||
! is_null($server['ssl_cert']) ||
! is_null($server['ssl_ca']) ||
! is_null($server['ssl_ca_path']) ||
! is_null($server['ssl_ciphers'])
if (! empty($server['ssl_key']) ||
! empty($server['ssl_cert']) ||
! empty($server['ssl_ca']) ||
! empty($server['ssl_ca_path']) ||
! empty($server['ssl_ciphers'])
) {
mysqli_ssl_set(
$link,
@ -143,6 +143,24 @@ class DbiMysqli implements DbiExtension
);
if ($return_value === false || is_null($return_value)) {
/*
* Switch to SSL if server asked us to do so
*
* - MySQL 8.0 and newer should return error 3159
* - older use #2001 - SSL Connection is required. Please specify SSL options and retry.
*/
$error_number = mysqli_connect_errno();
$error_message = mysqli_connect_error();
if (! $server['ssl'] && ($error_number == 3159 ||
($error_number == 2001 && stripos($error_message, 'SSL Connection is required') !== false))
) {
trigger_error(
_('SSL connection enforced by server, automatically enabling it.'),
E_USER_WARNING
);
$server['ssl'] = true;
return self::connect($user, $password, $server);
}
return false;
}