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

Merge branch 'QA_4_6'

Browse Source
This commit is contained in:
Michal Čihař 2016-04-06 13:52:07 +02:00
commit 2c1b18a75b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libraries/dbi/DBIMysqli.php
View File

@ -151,7 +151,7 @@ class DBIMysqli implements DBIExtension
}
/* Optionally enable SSL */
if ($cfg['Server']['ssl'] && defined('MYSQLI_CLIENT_SSL')) {
if ($cfg['Server']['ssl']) {
mysqli_ssl_set(
$link,
$cfg['Server']['ssl_key'],
@ -160,16 +160,16 @@ class DBIMysqli implements DBIExtension
$cfg['Server']['ssl_ca_path'],
$cfg['Server']['ssl_ciphers']
);
$ssl_flag = MYSQLI_CLIENT_SSL;
/*
* disables SSL certificate validation on mysqlnd for MySQL 5.6 or later
* @link https://bugs.php.net/bug.php?id=68344
* @link https://github.com/phpmyadmin/phpmyadmin/pull/11838
*/
if(!$cfg['Server']['ssl_verify'] && defined('MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT')) {
$ssl_flag = MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT;
}
$client_flags |= $ssl_flag;
mysqli_options(
$link,
MYSQLI_OPT_SSL_VERIFY_SERVER_CERT,
$cfg['Server']['ssl_verify']
);
}
if (! $server) {