Merge branch 'PHP-8.3' into PHP-8.4

Author: petk

cmake/cmake/platforms/Windows.cmake

@@ -99,13 +99,8 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
   set(HAVE_LANGINFO_H FALSE)
   set(HAVE_LCHOWN FALSE)
   set(HAVE_LIBPROC_H FALSE)
-  set(HAVE_LIBUTIL_H FALSE)
   set(HAVE_LINUX_FILTER_H FALSE)
-  set(HAVE_LINUX_IF_ETHER_H FALSE)
-  set(HAVE_LINUX_IF_PACKET_H FALSE)
   set(HAVE_LINUX_SOCK_DIAG_H FALSE)
-  set(HAVE_LINUX_UDP_H FALSE)
-  set(HAVE_MATH_H TRUE)
   set(HAVE_MEMCNTL FALSE)
   set(HAVE_MEMFD_CREATE FALSE)
   set(HAVE_MEMMEM FALSE)
@@ -136,7 +131,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
   set(HAVE_PTY_H FALSE)
   set(HAVE_PUTENV TRUE)
   set(HAVE_PWD_H FALSE)
-  set(HAVE_REALLOCARRAY FALSE)
   set(HAVE_RESOLV_H FALSE)
   set(HAVE_SCANDIR FALSE)
   set(HAVE_SETENV FALSE)
@@ -276,6 +270,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
   set(PHP_HAS_WNO_UNUSED_PARAMETER_C FALSE)
   set(PHP_HAS_WNO_UNUSED_PARAMETER_CXX FALSE)
   set(PHP_HAS_WSTRICT_PROTOTYPES_C FALSE)
+  set(PHP_SAPI_PHPDBG_HAS_UFFDIO_WRITEPROTECT_MODE_WP FALSE)
   set(PHP_ZEND_HAS_PGRAB FALSE)
 
   set(HAVE_SIZEOF_INT TRUE)

cmake/sapi/cgi/CMakeLists.txt

@@ -59,7 +59,12 @@ set_target_properties(
 )
 
 # BSD systems.
-check_struct_has_member("struct sockaddr_un" sun_len sys/un.h HAVE_STRUCT_SOCKADDR_UN_SUN_LEN)
+check_struct_has_member(
+  "struct sockaddr_un"
+  sun_len
+  sys/un.h
+  HAVE_STRUCT_SOCKADDR_UN_SUN_LEN
+)
 
 message(CHECK_START "Checking whether accept() requires cross-process locking")
 if(CMAKE_SYSTEM_NAME STREQUAL "SunOS")