Merge branch 'PHP-8.3' into PHP-8.4

Author: petk

cmake/ext/ftp/CMakeLists.txt

@@ -21,13 +21,10 @@ Build extension as shared.
 
 ## PHP_EXT_FTP_SSL
 
-* Default: `OFF`
+* Default: `ON`
 * Values: `ON|OFF`
 
-Explicitly enable FTP over SSL support when building without openssl extension
-(`PHP_EXT_OPENSSL=OFF`) or when using `phpize`. If the `openssl` extension is
-enabled at the configure step (`PHP_EXT_OPENSSL=ON`), FTP-SSL is enabled
-implicitly regardless of this option.
+Explicitly enable or disable FTP over SSL support.
 #]=============================================================================]
 
 cmake_minimum_required(VERSION 3.25...3.31)
@@ -58,10 +55,9 @@ cmake_dependent_option(
 
 cmake_dependent_option(
   PHP_EXT_FTP_SSL
-  "Explicitly enable FTP over SSL support when building without openssl\
-  extension (PHP_EXT_OPENSSL=OFF) or when using phpize."
-  OFF
-  "PHP_EXT_FTP;NOT PHP_EXT_OPENSSL"
+  "Explicitly enable FTP over SSL support."
+  ON
+  "PHP_EXT_FTP"
   OFF
 )
 
@@ -83,7 +79,7 @@ target_sources(
     php_ftp.c
 )
 
-if(PHP_EXT_FTP_SSL OR PHP_EXT_OPENSSL)
+if(PHP_EXT_FTP_SSL)
   find_package(OpenSSL ${PHP_OPENSSL_MIN_VERSION} COMPONENTS SSL)
   set_package_properties(
     OpenSSL

cmake/main/CMakeLists.txt

@@ -339,9 +339,11 @@ endfunction()
 # Configure main configuration header (php_config.h, config.w32.h).
 function(_php_main_configure_php_config)
   if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+    set(PHP_CONFIG_HEADER_GUARD "CONFIG_W32_H")
     set(PHP_CONFIG_H_WINDOWS 1)
     set(file config.w32.h)
   else()
+    set(PHP_CONFIG_HEADER_GUARD "PHP_CONFIG_H")
     set(PHP_CONFIG_H_WINDOWS 0)
     set(file php_config.h)
     set(HAVE_BUILD_DEFS_H TRUE)

cmake/main/cmake/php_config.h.in

@@ -1,4 +1,5 @@
-#if !defined(PHP_CONFIG_H) || @PHP_CONFIG_H_WINDOWS@
+#ifndef @PHP_CONFIG_HEADER_GUARD@
+#define @PHP_CONFIG_HEADER_GUARD@
 
 #if @PHP_CONFIG_H_WINDOWS@
 /* Define the minimum supported version */
@@ -28,8 +29,6 @@
 # define STDOUT_FILENO 1
 # define STDERR_FILENO 2
 #else
-# define PHP_CONFIG_H
-
 # if defined(__GNUC__) && __GNUC__ >= 4
 #  define ZEND_API __attribute__ ((visibility("default")))
 #  define ZEND_DLEXPORT __attribute__ ((visibility("default")))
@@ -688,4 +687,4 @@
 # include <string.h>
 #endif
 
-#endif /* PHP_CONFIG_H */
+#endif /* @PHP_CONFIG_HEADER_GUARD@ */