Merge branch 'PHP-8.4'

Author: petk

cmake/cmake/Bootstrap.cmake

@@ -10,6 +10,12 @@ define_property(
   BRIEF_DOCS "Whether the PHP SAPI or extension is CLI-based"
 )
 
+define_property(
+  TARGET
+  PROPERTY PHP_SAPI_FASTCGI
+  BRIEF_DOCS "Whether the PHP SAPI is FastCGI-based"
+)
+
 # Optionally enable CXX for extensions.
 include(CheckLanguage)
 check_language(CXX)

cmake/main/CMakeLists.txt

@@ -19,7 +19,6 @@ target_sources(
   php_main
   PRIVATE
     $<$<NOT:$<PLATFORM_ID:Windows>>:explicit_bzero.c>
-    fastcgi.c
     fopen_wrappers.c
     getopt.c
     main.c
@@ -153,6 +152,17 @@ target_include_directories(
 target_link_libraries(php_sapi INTERFACE PHP::main)
 target_sources(php_sapi INTERFACE $<TARGET_OBJECTS:PHP::main>)
 
+################################################################################
+# Add FastCGI target with objects for use in PHP SAPIs such as CGI and FPM.
+################################################################################
+add_library(php_main_fastcgi OBJECT fastcgi.c)
+
+target_sources(
+  php_sapi
+  INTERFACE
+    $<$<BOOL:$<TARGET_PROPERTY:PHP_SAPI_FASTCGI>>:$<TARGET_OBJECTS:php_main_fastcgi>>
+)
+
 ################################################################################
 # Create main/internal_functions*.c files with a list of static enabled PHP
 # extensions based on the PHP SAPI type.

cmake/sapi/cgi/CMakeLists.txt

@@ -57,6 +57,7 @@ set_target_properties(
     OUTPUT_NAME ${PHP_PROGRAM_PREFIX}php-cgi${PHP_PROGRAM_SUFFIX}
     ENABLE_EXPORTS TRUE # TODO: Check if there's a better solution.
     PHP_CLI TRUE
+    PHP_SAPI_FASTCGI TRUE
 )
 
 # BSD systems.

cmake/sapi/cli/CMakeLists.txt

@@ -128,13 +128,20 @@ set_target_properties(
     PHP_CLI TRUE
 )
 
+# Link editline library conditionally based on readline extension.
 if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-  # Link readline extension interface library if enabled and built statically.
-  target_link_libraries(
-    php_sapi_cli
-    PRIVATE
-      $<$<AND:$<TARGET_EXISTS:PHP::ext::readline>,$<NOT:$<IN_LIST:$<TARGET_PROPERTY:PHP::ext::readline,TYPE>,MODULE_LIBRARY;SHARED_LIBRARY>>>:$<TARGET_PROPERTY:PHP::ext::readline,IMPORTED_LINK_INTERFACE_LIBRARIES>>
-  )
+  set(type "")
+  if(PHP_EXT_READLINE)
+    get_target_property(type PHP::ext::readline TYPE)
+  endif()
+
+  if(NOT PHP_EXT_READLINE OR NOT type MATCHES "^(MODULE|SHARED)_LIBRARY$")
+    find_package(Editline)
+    if(Editline_FOUND)
+      target_link_libraries(php_sapi_cli PRIVATE Editline::Editline)
+      set(HAVE_LIBEDIT TRUE)
+    endif()
+  endif()
 endif()
 
 # Man documentation.
@@ -196,7 +203,7 @@ if(PHP_SAPI_CLI_WIN_NO_CONSOLE)
   target_link_options(
     php_sapi_cli_win
     PRIVATE
-      /stack:67108864
+      $<$<COMPILE_LANG_AND_ID:C,MSVC>:/stack:67108864>
   )
 endif()
 

cmake/sapi/cli/cmake/config.h.in

@@ -1,3 +1,6 @@
+/* Define to 1 if PHP uses the 'libedit' library. */
+#cmakedefine HAVE_LIBEDIT 1
+
 /* Define if the PS_STRINGS exists. */
 #cmakedefine HAVE_PS_STRINGS
 

cmake/sapi/fpm/CMakeLists.txt

@@ -242,6 +242,7 @@ set_target_properties(
   PROPERTIES
     OUTPUT_NAME ${PHP_PROGRAM_PREFIX}php-fpm${PHP_PROGRAM_SUFFIX}
     ENABLE_EXPORTS TRUE # TODO: Check if there's a better solution.
+    PHP_SAPI_FASTCGI TRUE
 )
 
 ################################################################################

docs/cmake/cmake.md

@@ -424,6 +424,12 @@ A list of PHP CMake modules:
   configuration. Extensions are sorted by their dependencies (extensions added
   with CMake command `add_dependencies()`).
 
+* `PHP_SAPI_FASTCGI`
+
+  Target property that marks the selected PHP SAPI target as FastCGI-related.
+  These SAPIs get the `main/fastcgi.c` object linked in the binary. For example,
+  PHP CGI and PHP FPM SAPIs.
+
 * `PHP_SAPIS`
 
   Global property with a list of all enabled PHP SAPIs for the current