From 66c0fbd6319e639b0ae752e2d0d292773c00bc7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Tue, 5 Apr 2016 09:57:29 +0200
Subject: [PATCH] Simplify SSL setup
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Simplify setup to follow current PHP documentation:

- the MYSQLI_CLIENT_SSL flag should not be needed
- there is mysqli_option flag to turn of certificate verification
- remove check for defined constants, all should be there in PHP
  versions we support

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

diff --git a/libraries/dbi/DBIMysqli.php b/libraries/dbi/DBIMysqli.php
index ac36f2737e..438ebe158d 100644
--- a/libraries/dbi/DBIMysqli.php
+++ b/libraries/dbi/DBIMysqli.php
@@ -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) {