Merge branch 'PHP-8.3' into PHP-8.4

Author: petk

cmake/cmake/modules/Findlibzip.cmake

@@ -26,9 +26,6 @@ This module defines the following imported targets:
 
 * `libzip_INCLUDE_DIR` - Directory containing package library headers.
 * `libzip_LIBRARY` - The path to the package library.
-* `libzip_HAVE_ENCRYPTION`
-* `libzip_HAVE_LIBZIP_VERSION`
-* `libzip_HAVE_SET_MTIME`
 
 ## Examples
 
@@ -41,8 +38,6 @@ target_link_libraries(example PRIVATE libzip::zip)
 ```
 #]=============================================================================]
 
-include(CheckSymbolExists)
-include(CMakePushCheckState)
 include(FeatureSummary)
 include(FindPackageHandleStandardArgs)
 
@@ -83,15 +78,15 @@ if(NOT libzip_LIBRARY)
 endif()
 
 block(PROPAGATE libzip_VERSION)
-  # Version in zipconf.h is available since libzip 1.4.0.
   if(EXISTS ${libzip_INCLUDE_DIR}/zipconf.h)
-    set(regex "^[ \t]*#[ \t]*define[ \t]+LIBZIP_VERSION[ \t]+\"?([^\"]+)\"?[ \t]*$")
-
-    file(STRINGS ${libzip_INCLUDE_DIR}/zipconf.h result REGEX "${regex}")
-
-    if(result MATCHES "${regex}")
-      set(libzip_VERSION "${CMAKE_MATCH_1}")
-    endif()
+    file(
+      STRINGS
+      ${libzip_INCLUDE_DIR}/zipconf.h
+      _
+      REGEX
+      "^[ \t]*#[ \t]*define[ \t]+LIBZIP_VERSION[ \t]+\"?([^\"]+)\"?[ \t]*$"
+    )
+    set(libzip_VERSION "${CMAKE_MATCH_1}")
   endif()
 
   if(
@@ -101,40 +96,6 @@ block(PROPAGATE libzip_VERSION)
   )
     set(libzip_VERSION ${PC_libzip_VERSION})
   endif()
-
-  # Determine libzip older version heuristically.
-  if(NOT libzip_VERSION AND libzip_INCLUDE_DIR AND libzip_LIBRARY)
-    cmake_push_check_state(RESET)
-      set(CMAKE_REQUIRED_INCLUDES ${libzip_INCLUDE_DIR})
-      set(CMAKE_REQUIRED_LIBRARIES ${libzip_LIBRARY})
-      set(CMAKE_REQUIRED_QUIET TRUE)
-
-      # zip_file_set_mtime is available with libzip 1.0.0.
-      check_symbol_exists(zip_file_set_mtime zip.h libzip_HAVE_SET_MTIME)
-
-      if(NOT libzip_HAVE_SET_MTIME)
-        set(libzip_VERSION 0.11)
-      else()
-        set(libzip_VERSION 1.0)
-      endif()
-
-      # zip_file_set_encryption is available in libzip 1.2.0.
-      check_symbol_exists(zip_file_set_encryption zip.h libzip_HAVE_ENCRYPTION)
-
-      if(libzip_HAVE_ENCRYPTION)
-        set(libzip_VERSION 1.2.0)
-      endif()
-
-      # zip_libzip_version is available in libzip 1.3.1.
-      check_symbol_exists(zip_libzip_version zip.h libzip_HAVE_LIBZIP_VERSION)
-
-      if(libzip_HAVE_LIBZIP_VERSION)
-        set(libzip_VERSION 1.3.1)
-      endif()
-    cmake_pop_check_state()
-
-    message(WARNING "The libzip version might not be correctly determined")
-  endif()
 endblock()
 
 mark_as_advanced(libzip_INCLUDE_DIR libzip_LIBRARY)

cmake/cmake/platforms/Windows.cmake

@@ -115,7 +115,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
   set(HAVE_SCANDIR FALSE)
   set(HAVE_SETENV FALSE)
   set(HAVE_SETITIMER FALSE)
-  set(HAVE_SETPROCTITLE FALSE)
   set(HAVE_SIGPROCMASK FALSE)
   set(HAVE_SIZEOF_GID_T FALSE)
   set(HAVE_SIZEOF_SSIZE_T FALSE)
@@ -131,8 +130,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
   set(HAVE_STRNLEN TRUE)
   set(HAVE_STRUCT_FLOCK FALSE)
   set(HAVE_STRUCT_SOCKADDR_SA_LEN FALSE)
-  set(HAVE_STRUCT_SOCKADDR_STORAGE FALSE)
-  set(HAVE_STRUCT_SOCKADDR_UN_SUN_LEN FALSE)
   set(HAVE_STRUCT_STAT_ST_BLKSIZE FALSE)
   set(HAVE_STRUCT_STAT_ST_BLOCKS FALSE)
   set(HAVE_STRUCT_STAT_ST_RDEV TRUE)
@@ -147,7 +144,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
   set(HAVE_SYS_MOUNT_H FALSE)
   set(HAVE_SYS_PARAM_H FALSE)
   set(HAVE_SYS_POLL_H FALSE)
-  set(HAVE_SYS_PSTAT_H FALSE)
   set(HAVE_SYS_RESOURCE_H FALSE)
   set(HAVE_SYS_SELECT_H FALSE)
   set(HAVE_SYS_STAT_H TRUE)
@@ -260,7 +256,10 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
   set(PHP_HAVE_STRINGS_H FALSE)
   set(PHP_HAVE_SYS_SOCKET_H FALSE)
   set(PHP_HAVE_UNISTD_H FALSE)
+  set(PHP_SAPI_HAVE_SETPROCTITLE FALSE)
+  set(PHP_SAPI_CGI_HAVE_STRUCT_SOCKADDR_UN_SUN_LEN FALSE)
   set(PHP_SAPI_CLI_HAVE_PS_STRINGS FALSE)
+  set(PHP_SAPI_CLI_HAVE_SYS_PSTAT_H FALSE)
   set(PHP_SAPI_PHPDBG_HAS_UFFDIO_WRITEPROTECT_MODE_WP FALSE)
   set(PHP_ZEND_HAS_PGRAB FALSE)
 

cmake/cmake/toolchains/template.cmake

@@ -52,7 +52,7 @@ set(ZEND_MM_EXITCODE__TRYRUN_OUTPUT "(size_t)8 (size_t)3 0")
 ################################################################################
 
 # Set the exit code of the ptrace() check.
-set(PHP_SAPI_FPM_HAS_PTRACE_EXITCODE 0)
+set(PHP_SAPI_FPM_HAVE_PTRACE_EXITCODE 0)
 
 # Set the process memory access file - 'mem' on Linux-alike or 'as' on
 # Solaris-alike target systems for the PHP FPM to use pread trace type

cmake/ext/zip/CMakeLists.txt

@@ -79,7 +79,7 @@ if(NOT libzip_FOUND)
 endif()
 
 if(NOT libzip_FOUND)
-  find_package(libzip 0.11...1.3.0)
+  find_package(libzip 0.11.2...1.3.0)
 endif()
 
 if(libzip_VERSION VERSION_EQUAL 1.3.1 OR libzip_VERSION VERSION_EQUAL 1.7.0)

cmake/sapi/cgi/CMakeLists.txt

@@ -63,8 +63,9 @@ check_struct_has_member(
   "struct sockaddr_un"
   sun_len
   sys/un.h
-  HAVE_STRUCT_SOCKADDR_UN_SUN_LEN
+  PHP_SAPI_CGI_HAVE_STRUCT_SOCKADDR_UN_SUN_LEN
 )
+set(HAVE_STRUCT_SOCKADDR_UN_SUN_LEN ${PHP_SAPI_CGI_HAVE_STRUCT_SOCKADDR_UN_SUN_LEN})
 
 message(CHECK_START "Checking whether accept() requires cross-process locking")
 if(CMAKE_SYSTEM_NAME STREQUAL "SunOS")

cmake/sapi/cli/CMakeLists.txt

@@ -57,8 +57,11 @@ endif()
 # Configuration checks.
 ################################################################################
 
-check_symbol_exists(setproctitle "unistd.h;stdlib.h" HAVE_SETPROCTITLE)
-check_include_files(sys/pstat.h HAVE_SYS_PSTAT_H)
+check_symbol_exists(setproctitle "unistd.h;stdlib.h" PHP_SAPI_HAVE_SETPROCTITLE)
+set(HAVE_SETPROCTITLE ${PHP_SAPI_HAVE_SETPROCTITLE})
+
+check_include_files(sys/pstat.h PHP_SAPI_CLI_HAVE_SYS_PSTAT_H)
+set(HAVE_SYS_PSTAT_H ${PHP_SAPI_CLI_HAVE_SYS_PSTAT_H})
 
 # For some BSD-based systems.
 message(CHECK_START "Checking for PS_STRINGS")

cmake/sapi/fpm/CMakeLists.txt

@@ -247,12 +247,23 @@ set_target_properties(
 # Configuration checks.
 ################################################################################
 
-check_symbol_exists(clearenv stdlib.h HAVE_CLEARENV)
-check_symbol_exists(port_create port.h HAVE_PORT_CREATE)
-check_symbol_exists(setpflags priv.h HAVE_SETPFLAGS)
-check_symbol_exists(setproctitle "unistd.h;stdlib.h" HAVE_SETPROCTITLE)
-check_symbol_exists(setproctitle_fast unistd.h HAVE_SETPROCTITLE_FAST)
-check_symbol_exists(times sys/times.h HAVE_TIMES)
+check_symbol_exists(clearenv stdlib.h PHP_SAPI_FPM_HAVE_CLEARENV)
+set(HAVE_CLEARENV ${PHP_SAPI_FPM_HAVE_CLEARENV})
+
+check_symbol_exists(port_create port.h PHP_SAPI_FPM_HAVE_PORT_CREATE)
+set(HAVE_PORT_CREATE ${PHP_SAPI_FPM_HAVE_PORT_CREATE})
+
+check_symbol_exists(setpflags priv.h PHP_SAPI_FPM_HAVE_SETPFLAGS)
+set(HAVE_SETPFLAGS ${PHP_SAPI_FPM_HAVE_SETPFLAGS})
+
+check_symbol_exists(setproctitle "unistd.h;stdlib.h" PHP_SAPI_HAVE_SETPROCTITLE)
+set(HAVE_SETPROCTITLE ${PHP_SAPI_HAVE_SETPROCTITLE})
+
+check_symbol_exists(setproctitle_fast unistd.h PHP_SAPI_FPM_HAVE_SETPROCTITLE_FAST)
+set(HAVE_SETPROCTITLE_FAST ${PHP_SAPI_FPM_HAVE_SETPROCTITLE_FAST})
+
+check_symbol_exists(times sys/times.h PHP_SAPI_FPM_HAVE_TIMES)
+set(HAVE_TIMES ${PHP_SAPI_FPM_HAVE_TIMES})
 
 include(cmake/CheckClockGetTime.cmake)
 include(cmake/CheckCompilerAtomicBuiltins.cmake)

cmake/sapi/fpm/cmake/CheckClockGetTime.cmake

@@ -11,16 +11,16 @@ php_search_libraries(
   HEADERS time.h
   LIBRARIES
     rt # Solaris 10
-  VARIABLE PHP_SAPI_FPM_HAS_CLOCK_GETTIME
+  VARIABLE PHP_SAPI_FPM_HAVE_CLOCK_GETTIME
   TARGET php_sapi_fpm PRIVATE
 )
-set(HAVE_CLOCK_GETTIME ${PHP_SAPI_FPM_HAS_CLOCK_GETTIME})
+set(HAVE_CLOCK_GETTIME ${PHP_SAPI_FPM_HAVE_CLOCK_GETTIME})
 
 # Checking for working clock_get_time() on macOS systems is obsolete as of macOS
 # Sierra (10.12) where the clock_gettime() was added.
 if(
-  NOT PHP_SAPI_FPM_HAS_CLOCK_GETTIME
-  AND NOT DEFINED PHP_SAPI_FPM_HAS_CLOCK_GET_TIME
+  NOT PHP_SAPI_FPM_HAVE_CLOCK_GETTIME
+  AND NOT DEFINED PHP_SAPI_FPM_HAVE_CLOCK_GET_TIME
 )
   message(CHECK_START "Checking for clock_get_time()")
 
@@ -29,9 +29,9 @@ if(
   if(
     CMAKE_CROSSCOMPILING
     AND NOT CMAKE_CROSSCOMPILING_EMULATOR
-    AND NOT DEFINED PHP_SAPI_FPM_HAS_CLOCK_GET_TIME_EXITCODE
+    AND NOT DEFINED PHP_SAPI_FPM_HAVE_CLOCK_GET_TIME_EXITCODE
   )
-    set(PHP_SAPI_FPM_HAS_CLOCK_GET_TIME_EXITCODE 0)
+    set(PHP_SAPI_FPM_HAVE_CLOCK_GET_TIME_EXITCODE 0)
   endif()
 
   cmake_push_check_state(RESET)
@@ -59,18 +59,14 @@ if(
 
         return 0;
       }
-    ]] PHP_SAPI_FPM_HAS_CLOCK_GET_TIME)
+    ]] PHP_SAPI_FPM_HAVE_CLOCK_GET_TIME)
   cmake_pop_check_state()
 
-  if(PHP_SAPI_FPM_HAS_CLOCK_GET_TIME)
+  if(PHP_SAPI_FPM_HAVE_CLOCK_GET_TIME)
     message(CHECK_PASS "yes")
   else()
     message(CHECK_FAIL "no")
   endif()
 endif()
 
-if(PHP_SAPI_FPM_HAS_CLOCK_GET_TIME)
-  set(HAVE_CLOCK_GET_TIME TRUE)
-else()
-  set(HAVE_CLOCK_GET_TIME FALSE)
-endif()
+set(HAVE_CLOCK_GET_TIME "${PHP_SAPI_FPM_HAVE_CLOCK_GET_TIME}")

cmake/sapi/fpm/cmake/CheckCompilerAtomicBuiltins.cmake

@@ -10,7 +10,7 @@ include(CheckSourceCompiles)
 include(CMakePushCheckState)
 
 # Skip in consecutive configuration phases.
-if(NOT DEFINED PHP_SAPI_FPM_HAS_BUILTIN_ATOMIC)
+if(NOT DEFINED PHP_SAPI_FPM_HAVE_BUILTIN_ATOMIC)
   message(CHECK_START "Checking if compiler has __sync_bool_compare_and_swap")
 
   cmake_push_check_state(RESET)
@@ -22,14 +22,14 @@ if(NOT DEFINED PHP_SAPI_FPM_HAS_BUILTIN_ATOMIC)
         return (__sync_bool_compare_and_swap(&variable, 1, 2)
               && __sync_add_and_fetch(&variable, 1)) ? 1 : 0;
       }
-    ]] PHP_SAPI_FPM_HAS_BUILTIN_ATOMIC)
+    ]] PHP_SAPI_FPM_HAVE_BUILTIN_ATOMIC)
   cmake_pop_check_state()
 
-  if(PHP_SAPI_FPM_HAS_BUILTIN_ATOMIC)
+  if(PHP_SAPI_FPM_HAVE_BUILTIN_ATOMIC)
     message(CHECK_PASS "yes")
   else()
     message(CHECK_FAIL "no")
   endif()
 endif()
 
-set(HAVE_BUILTIN_ATOMIC ${PHP_SAPI_FPM_HAS_BUILTIN_ATOMIC})
+set(HAVE_BUILTIN_ATOMIC ${PHP_SAPI_FPM_HAVE_BUILTIN_ATOMIC})

cmake/sapi/fpm/cmake/CheckEpoll.cmake

@@ -10,7 +10,7 @@ include(CheckSourceCompiles)
 include(CMakePushCheckState)
 
 # Skip in consecutive configuration phases.
-if(NOT DEFINED PHP_SAPI_FPM_HAS_EPOLL)
+if(NOT DEFINED PHP_SAPI_FPM_HAVE_EPOLL)
   message(CHECK_START "Checking for epoll")
   cmake_push_check_state(RESET)
     set(CMAKE_REQUIRED_QUIET TRUE)
@@ -41,14 +41,14 @@ if(NOT DEFINED PHP_SAPI_FPM_HAS_EPOLL)
 
         return 0;
       }
-    ]] PHP_SAPI_FPM_HAS_EPOLL)
+    ]] PHP_SAPI_FPM_HAVE_EPOLL)
   cmake_pop_check_state()
 
-  if(PHP_SAPI_FPM_HAS_EPOLL)
+  if(PHP_SAPI_FPM_HAVE_EPOLL)
     message(CHECK_PASS "yes")
   else()
     message(CHECK_FAIL "no")
   endif()
 endif()
 
-set(HAVE_EPOLL ${PHP_SAPI_FPM_HAS_EPOLL})
+set(HAVE_EPOLL ${PHP_SAPI_FPM_HAVE_EPOLL})