Skip to content

Commit 067ac63

Browse files
committed
Merge branch 'PHP-8.4'
* PHP-8.4: [skip ci] Fix MYSQLND_HAVE_SSL preprocessor help texts
2 parents 62e53e6 + 41347f0 commit 067ac63

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

ext/mysqlnd/config.w32

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ if (PHP_MYSQLND != "no") {
3737
AC_DEFINE("MYSQLND_COMPRESSION_ENABLED", 1, "Define to 1 if mysqlnd has compressed protocol support.");
3838
AC_DEFINE("MYSQLND_SSL_SUPPORTED", 1, "Define to 1 if mysqlnd core SSL is enabled.");
3939
if (CHECK_LIB("crypt32.lib", "mysqlnd")) {
40-
AC_DEFINE("MYSQLND_HAVE_SSL", 1, "Define to 1 if mysqlnd extended SSL is enabled through OpenSSL.");
40+
AC_DEFINE("MYSQLND_HAVE_SSL", 1, "Define to 1 if mysqlnd extended SSL is enabled through a system library.");
4141
ADD_EXTENSION_DEP('mysqlnd', 'hash');
4242
}
4343
}

ext/mysqlnd/config9.m4

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ if test "$PHP_MYSQLND" != "no" || test "$PHP_MYSQLND_ENABLED" = "yes"; then
6666
AS_VAR_IF([PHP_MYSQLND_SSL], [no],,
6767
[PHP_SETUP_OPENSSL([MYSQLND_SHARED_LIBADD], [
6868
AC_DEFINE([MYSQLND_HAVE_SSL], [1],
69-
[Define to 1 if mysqlnd extended SSL is enabled through OpenSSL.])
69+
[Define to 1 if mysqlnd extended SSL is enabled through a system library.])
7070
PHP_ADD_EXTENSION_DEP(mysqlnd, hash)
7171
])])
7272

0 commit comments

Comments
 (0)