Merge branch 'PHP-8.4'

Author: petk

cmake/ext/mysqlnd/CMakeLists.txt

@@ -33,12 +33,10 @@ add_feature_info(
 
 cmake_dependent_option(
   EXT_MYSQLND_SSL
-  "Explicitly enable extended SSL support in the mysqlnd extension when\
-  building without openssl extension (EXT_OPENSSL=OFF) or when using phpize. If\
-  the openssl extension is enabled at the configure step (EXT_OPENSSL=ON),\
-  extended SSL is enabled implicitly regardless of this option."
+  "Explicitly enable extended SSL support in the mysqlnd extension through a\
+  system library OpenSSL (*nix) or Crypt32 (Windows)."
   OFF
-  "EXT_MYSQLND;NOT EXT_OPENSSL"
+  [[EXT_MYSQLND AND NOT EXT_OPENSSL AND NOT CMAKE_SYSTEM_NAME STREQUAL "Windows"]]
   OFF
 )
 
@@ -118,20 +116,29 @@ set(MYSQLND_SSL_SUPPORTED 1 CACHE INTERNAL "Enable core mysqlnd SSL code")
 # A deferred configuration, so it is executed after the openssl extension to
 # have the EXT_OPENSSL variable available.
 function(php_mysqlnd_post_configuration)
-  if(EXT_MYSQLND_SSL OR EXT_OPENSSL)
-    find_package(OpenSSL ${PHP_OPENSSL_MIN_VERSION})
-    set_package_properties(
-      OpenSSL
-      PROPERTIES
-        TYPE REQUIRED
-        PURPOSE "Necessary to enable SSL in the mysqlnd extension."
+  if(
+    (
+      NOT CMAKE_SYSTEM_NAME STREQUAL "Windows"
+      AND (EXT_MYSQLND_SSL OR EXT_OPENSSL)
     )
-
-    target_link_libraries(php_mysqlnd PRIVATE OpenSSL::Crypto)
+    OR CMAKE_SYSTEM_NAME STREQUAL "Windows"
+  )
+    if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+      target_link_libraries(php_mysqlnd PRIVATE crypt32)
+    else()
+      find_package(OpenSSL ${PHP_OPENSSL_MIN_VERSION})
+      set_package_properties(
+        OpenSSL
+        PROPERTIES
+          TYPE REQUIRED
+          PURPOSE "Necessary to enable SSL in the mysqlnd extension."
+      )
+      target_link_libraries(php_mysqlnd PRIVATE OpenSSL::Crypto)
+    endif()
 
     set(
       MYSQLND_HAVE_SSL 1
-      CACHE INTERNAL "Enable mysqlnd extended SSL that uses OpenSSL directly"
+      CACHE INTERNAL "Enable mysqlnd extended SSL"
     )
 
     add_dependencies(php_mysqlnd php_hash)
@@ -140,7 +147,7 @@ function(php_mysqlnd_post_configuration)
   add_feature_info(
     "ext/mysqlnd SSL"
     MYSQLND_HAVE_SSL
-    "Extended SSL support through OpenSSL"
+    "Extended SSL support through a system library"
   )
 endfunction()
 

cmake/main/php_config.cmake.h.in

@@ -1783,7 +1783,8 @@
 /* Define to 1 if mysqlnd has compressed protocol support. */
 #cmakedefine MYSQLND_COMPRESSION_ENABLED 1
 
-/* Define to 1 if mysqlnd extended SSL is enabled through OpenSSL. */
+/* Define to 1 if mysqlnd has extended SSL enabled through a system library
+   OpenSSL (*nix systems), or Crypt32 (Windows systems). */
 #cmakedefine MYSQLND_HAVE_SSL 1
 
 /* Define to 1 if mysqlnd core SSL is enabled. */

docs/configuration.md

@@ -219,6 +219,22 @@ documentation.
 
 ## 6. PHP extensions configuration
 
+* `EXT_MYSQLND_SSL=OFF|ON`
+
+  Default: `OFF`
+
+  Explicitly enable extended SSL support in the `mysqlnd` extension. On \*nix
+  systems, extended SSL works through the OpenSSL library and on Windows through
+  the Windows Crypt32 library. Beneficial when building without the `openssl`
+  extension or when building with phpize.
+
+  \*nix systems: when building with the `openssl` extension (`EXT_OPENSSL=ON`)
+  in the php-src tree, the extended SSL is enabled implicitly regardless of this
+  option.
+
+  Windows systems: extended SSL is enabled implicitly based on the Crypt32
+  library regardless of this option.
+
 * `EXT_ODBC=OFF|ON`
 
   Default: `OFF`