Merge branch 'PHP-8.3' into PHP-8.4

Author: petk

cmake/cmake/ConfigureChecks.cmake

@@ -142,12 +142,17 @@ cmake_pop_check_state()
 
 # Check for sockaddr_storage and sockaddr.sa_len.
 cmake_push_check_state(RESET)
-  set(CMAKE_EXTRA_INCLUDE_FILES "sys/socket.h")
+  if(HAVE_SYS_SOCKET_H)
+    list(APPEND CMAKE_EXTRA_INCLUDE_FILES "sys/socket.h")
+  endif()
+  if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+    list(APPEND CMAKE_EXTRA_INCLUDE_FILES "winsock2.h")
+  endif()
   check_type_size("struct sockaddr_storage" STRUCT_SOCKADDR_STORAGE)
   check_struct_has_member(
     "struct sockaddr"
     sa_len
-    "sys/socket.h"
+    "${CMAKE_EXTRA_INCLUDE_FILES}"
     HAVE_STRUCT_SOCKADDR_SA_LEN
   )
 cmake_pop_check_state()
@@ -520,7 +525,7 @@ php_search_libraries(
   socket
   HEADERS
     sys/socket.h
-    winsock.h
+    winsock2.h
   LIBRARIES
     socket  # Solaris <= 11.3, illumos
     network # Haiku
@@ -547,7 +552,7 @@ php_search_libraries(
   gethostname
   HEADERS
     unistd.h
-    winsock.h
+    winsock2.h
   LIBRARIES
     network # Haiku
     ws2_32  # Windows
@@ -563,7 +568,7 @@ php_search_libraries(
   HEADERS
     netdb.h
     sys/socket.h
-    winsock.h
+    winsock2.h
   LIBRARIES
     nsl     # Solaris <= 11.3, illumos
     network # Haiku
@@ -646,7 +651,7 @@ php_search_libraries(
   HEADERS
     sys/types.h
     sys/socket.h
-    winsock.h
+    winsock2.h
   LIBRARIES
     socket  # Solaris <= 11.3, illumos
     network # Haiku
@@ -675,7 +680,7 @@ php_search_libraries(
   getprotobyname
   HEADERS
     netdb.h
-    winsock.h
+    winsock2.h
   LIBRARIES
     socket  # Solaris <= 11.3, illumos
     network # Haiku
@@ -691,7 +696,7 @@ php_search_libraries(
   getprotobynumber
   HEADERS
     netdb.h
-    winsock.h
+    winsock2.h
   LIBRARIES
     socket  # Solaris <= 11.3, illumos
     network # Haiku
@@ -707,7 +712,7 @@ php_search_libraries(
   getservbyname
   HEADERS
     netdb.h
-    winsock.h
+    winsock2.h
   LIBRARIES
     socket  # Solaris <= 11.3, illumos
     network # Haiku
@@ -723,7 +728,7 @@ php_search_libraries(
   getservbyport
   HEADERS
     netdb.h
-    winsock.h
+    winsock2.h
   LIBRARIES
     socket  # Solaris <= 11.3, illumos
     network # Haiku
@@ -739,7 +744,7 @@ php_search_libraries(
   shutdown
   HEADERS
     sys/socket.h
-    winsock.h
+    winsock2.h
   LIBRARIES
     socket  # Solaris <= 11.3, illumos
     network # Haiku

cmake/cmake/Requirements.cmake

@@ -69,17 +69,17 @@ message(CHECK_START "Checking system character set")
 if(CMAKE_CROSSCOMPILING AND NOT CMAKE_CROSSCOMPILING_EMULATOR)
   # EBCDIC targets are obsolete, assume that target uses ASCII when
   # cross-compiling without emulator.
-  set(PHP_IS_EBCDIC_EXITCODE 1)
+  set(PHP_HAS_EBCDIC_EXITCODE 1)
 endif()
 
 cmake_push_check_state(RESET)
   set(CMAKE_REQUIRED_QUIET TRUE)
   check_source_runs(C [[
     int main(void) { return (unsigned char)'A' != (unsigned char)0xC1; }
-  ]] PHP_IS_EBCDIC)
+  ]] PHP_HAS_EBCDIC)
 cmake_pop_check_state()
 
-if(PHP_IS_EBCDIC)
+if(PHP_HAS_EBCDIC)
   message(CHECK_FAIL "EBCDIC")
   message(FATAL_ERROR "PHP does not support EBCDIC targets.")
 else()

cmake/cmake/platforms/Windows.cmake

@@ -208,7 +208,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
   set(HAVE_UTIME_H FALSE)
   set(HAVE_UTIMES FALSE)
   set(HAVE_VASPRINTF FALSE)
-  set(HAVE_WINSOCK_H TRUE)
   set(HAVE_WMMINTRIN_H TRUE)
   set(HAVE_WS2TCPIP_H TRUE)
   set(PHP_EXT_GD_HAS_FLOORF TRUE)
@@ -217,6 +216,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
   set(PHP_HAS_DN_EXPAND FALSE)
   set(PHP_HAS_DN_SKIPNAME FALSE)
   set(PHP_HAS_DNS_SEARCH FALSE)
+  set(PHP_HAS_EBCDIC FALSE)
   set(PHP_HAS_ELF FALSE)
   set(PHP_HAS_FFP_CONTRACT_OFF_C FALSE)
   set(PHP_HAS_FNO_COMMON_C FALSE)
@@ -276,15 +276,22 @@ 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_IS_EBCDIC FALSE)
   set(PHP_ZEND_HAS_PGRAB FALSE)
 
-  #set(HAVE_SIZEOF_INT TRUE)
-  #set(HAVE_SIZEOF_LONG TRUE)
-  #set(HAVE_SIZEOF_LONG_LONG TRUE)
-  #set(HAVE_SIZEOF_OFF_T TRUE)
-  #set(HAVE_SIZEOF_PTRDIFF_T TRUE)
-  #set(HAVE_SIZEOF_SIZE_T TRUE)
+  set(HAVE_SIZEOF_INT TRUE)
+  set(SIZEOF_INT 4)
+
+  set(HAVE_SIZEOF_LONG TRUE)
+  set(SIZEOF_LONG 4)
+
+  set(HAVE_SIZEOF_LONG_LONG TRUE)
+  set(SIZEOF_LONG_LONG 8)
+
+  set(HAVE_SIZEOF_OFF_T TRUE)
+  set(SIZEOF_OFF_T 4)
+
+  set(HAVE_SIZEOF_SIZE_T TRUE)
+  set(HAVE_SIZEOF_PTRDIFF_T TRUE)
   if(CMAKE_SIZEOF_VOID_P EQUAL 4)
     set(SIZEOF_PTRDIFF_T 4)
     set(SIZEOF_SIZE_T 4)

cmake/ext/sockets/CMakeLists.txt

@@ -103,16 +103,6 @@ check_symbol_exists(sockatmark sys/socket.h HAVE_SOCKATMARK)
 check_include_files(sys/sockio.h HAVE_SYS_SOCKIO_H)
 check_include_files(linux/filter.h HAVE_LINUX_FILTER_H)
 
-if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-  check_include_files(winsock.h PHP_EXT_SOCKETS_HAS_WINSOCK_H)
-  if(NOT PHP_EXT_SOCKETS_HAS_WINSOCK_H)
-    message(
-      FATAL_ERROR
-      "Required file winsock.h is missing for the socket extension."
-    )
-  endif()
-endif()
-
 # Check for field ss_family in sockaddr_storage (missing in AIX until 5.3).
 check_struct_has_member(
   "struct sockaddr_storage"