From 0d9387299efe4d5bf2849c5dec0230edddd57520 Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Thu, 17 Oct 2024 09:31:30 +0200 Subject: [PATCH] Fix MYSQLND_HAVE_SSL preprocessor help texts The MYSQLND_HAVE_SSL indicate that mysqlnd has extended SSL support enabled through either OpenSSL when building with Autotools, and through crypt32 library on Windows. Fixes https://github.com/php/php-src/pull/15164#discussion_r1803834585 --- ext/mysqlnd/config.w32 | 2 +- ext/mysqlnd/config9.m4 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/mysqlnd/config.w32 b/ext/mysqlnd/config.w32 index 9fb58ed50ddf7..e9ff75f237ced 100644 --- a/ext/mysqlnd/config.w32 +++ b/ext/mysqlnd/config.w32 @@ -37,7 +37,7 @@ if (PHP_MYSQLND != "no") { AC_DEFINE("MYSQLND_COMPRESSION_ENABLED", 1, "Define to 1 if mysqlnd has compressed protocol support."); AC_DEFINE("MYSQLND_SSL_SUPPORTED", 1, "Define to 1 if mysqlnd core SSL is enabled."); if (CHECK_LIB("crypt32.lib", "mysqlnd")) { - AC_DEFINE("MYSQLND_HAVE_SSL", 1, "Define to 1 if mysqlnd extended SSL is enabled through OpenSSL."); + AC_DEFINE("MYSQLND_HAVE_SSL", 1, "Define to 1 if mysqlnd extended SSL is enabled through a system library."); ADD_EXTENSION_DEP('mysqlnd', 'hash'); } } diff --git a/ext/mysqlnd/config9.m4 b/ext/mysqlnd/config9.m4 index 1b1d576d440c8..800677f8d731e 100644 --- a/ext/mysqlnd/config9.m4 +++ b/ext/mysqlnd/config9.m4 @@ -66,7 +66,7 @@ if test "$PHP_MYSQLND" != "no" || test "$PHP_MYSQLND_ENABLED" = "yes"; then AS_VAR_IF([PHP_MYSQLND_SSL], [no],, [PHP_SETUP_OPENSSL([MYSQLND_SHARED_LIBADD], [ AC_DEFINE([MYSQLND_HAVE_SSL], [1], - [Define to 1 if mysqlnd extended SSL is enabled through OpenSSL.]) + [Define to 1 if mysqlnd extended SSL is enabled through a system library.]) PHP_ADD_EXTENSION_DEP(mysqlnd, hash) ])])