Fixed bug #53795 (Connect Error from MySqli (mysqlnd) when using SSL)

diff --git a/NEWS b/NEWS
index 9ad592e2104e939a3ef238df934a2b1488ce7083..3929ac5accf9257f9a39d22b51562b49e6c10d00 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -73,6 +73,8 @@
 - MySQL Improved extension:
   . Added 'db' and 'catalog' keys to the field fetching functions (FR #39847). 
     (Kalle)
+  . Fixed bug #53795 (Connect Error from MySqli (mysqlnd) when using SSL). 
+    (Kalle)
   . Fixed bug #53503 (mysqli::query returns false after successful LOAD DATA 
     query). (Kalle, Andrey)
   . Fixed bug #53425 (mysqli_real_connect() ignores client flags when built to 

diff --git a/ext/mysqlnd/config.w32 b/ext/mysqlnd/config.w32
index 4a32cbcb9d8b4dbd903d2b7967f754752cc40016..9f6ccc5e3831b8a396530b62568cc5814bf7892d 100644 (file)
--- a/ext/mysqlnd/config.w32
+++ b/ext/mysqlnd/config.w32
@@ -24,6 +24,7 @@ if (PHP_MYSQLND != "no") {
                        (PHP_ZLIB_SHARED && CHECK_LIB("zlib.lib", "mysqlnd", PHP_MYSQLND)) || (PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED)))
                {
                        AC_DEFINE("MYSQLND_COMPRESSION_ENABLED", 1, "Compression support");
+                       AC_DEFINE("MYSQLND_SSL_SUPPORTED", 1, "SSL support");
                }
                PHP_INSTALL_HEADERS("", "ext/mysqlnd");
        }