From fdec3afe1b4ce4c41fa565ab819209ed5a0391c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Mon, 18 Apr 2016 11:12:48 +0200
Subject: [PATCH] Fix disabling SSL client verification
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Issue #12146

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 libraries/dbi/DBIMysqli.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/libraries/dbi/DBIMysqli.php b/libraries/dbi/DBIMysqli.php
index 438ebe158d..eebdfb61a6 100644
--- a/libraries/dbi/DBIMysqli.php
+++ b/libraries/dbi/DBIMysqli.php
@@ -165,11 +165,14 @@ class DBIMysqli implements DBIExtension
              * @link https://bugs.php.net/bug.php?id=68344
              * @link https://github.com/phpmyadmin/phpmyadmin/pull/11838
              */
-            mysqli_options(
-                $link,
-                MYSQLI_OPT_SSL_VERIFY_SERVER_CERT,
-                $cfg['Server']['ssl_verify']
-            );
+            if (! $cfg['Server']['ssl_verify']) {
+                mysqli_options(
+                    $link,
+                    MYSQLI_OPT_SSL_VERIFY_SERVER_CERT,
+                    $cfg['Server']['ssl_verify']
+                );
+                $client_flags |= MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT;
+            }
         }
 
         if (! $server) {