From 171bcb9a85bbb6ffb7d0a6c4b0cbdb5f7ded9387 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 6 Jun 2016 09:31:25 +0200 Subject: [PATCH] Fix MySQL SSL connection with some PHP versions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It seems that for some PHP versions this flag is needed even though it's not documented like this. Anyway this flag doesn't cause any harm, so lets keep it enabled. Issue #12293 Signed-off-by: Michal Čihař --- ChangeLog | 1 + libraries/dbi/DBIMysqli.php | 1 + 2 files changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index 020d52df74..77f35aab17 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ phpMyAdmin - ChangeLog - issue #12279 Fixed error reporting on connect problems - issue #12290 Fixed export of tables without explicitly set engine - issue #12285 Designer JavaScript error: Show/Hide tables list +- issue #12293 Fix MySQL SSL connection with some PHP versions 4.6.2 (2016-05-25) - issue [security] User SQL queries can be revealed through URL GET parameters, see PMASA-2016-14 diff --git a/libraries/dbi/DBIMysqli.php b/libraries/dbi/DBIMysqli.php index 2786884701..ec5e7b23a6 100644 --- a/libraries/dbi/DBIMysqli.php +++ b/libraries/dbi/DBIMysqli.php @@ -149,6 +149,7 @@ class DBIMysqli implements DBIExtension /* Optionally enable SSL */ if ($cfg['Server']['ssl']) { + $client_flags |= MYSQLI_CLIENT_SSL; mysqli_ssl_set( $link, $cfg['Server']['ssl_key'],