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-11-18 13:44:15 +01:00
commit b6a8589037
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -45,6 +45,7 @@ phpMyAdmin - ChangeLog
4.7.6 (not yet released)
- issue #13517 Fixed check all interaction with filtering
- issue #13803 Add SJIS-win to default list of allowed charsets
- issue #13436 Improve detection that MySQL server needs SSL connection
4.7.5 (2017-10-23)
- issue #13615 Avoid problems with browsing unknown query types

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

@ -153,15 +153,17 @@ class DbiMysqli implements DbiExtension
if ($return_value === false || is_null($return_value)) {
/*
* Switch to SSL if server asked us to do so
* Switch to SSL if server asked us to do so, unfortunately
* there are more ways MySQL server can tell this:
*
* - MySQL 8.0 and newer should return error 3159
* - older use #2001 - SSL Connection is required. Please specify SSL options and retry.
* - #2001 - SSL Connection is required. Please specify SSL options and retry.
* - #9002 - 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))
(($error_number == 2001 || $error_number == 9002) && stripos($error_message, 'SSL Connection is required') !== false))
) {
trigger_error(
_('SSL connection enforced by server, automatically enabling it.'),