Merge branch 'upstream-curl' into update-curl

* upstream-curl:
  curl 2023-10-11 (d755a5f7)

Issue: #25329

1 files changed, 13 insertions, 7 deletions

diff --git a/Utilities/cmcurl/CMake/Platforms/WindowsCache.cmake b/Utilities/cmcurl/CMake/Platforms/WindowsCache.cmake
index 44a1fc9..5daec0e 100644
--- a/Utilities/cmcurl/CMake/Platforms/WindowsCache.cmake
+++ b/Utilities/cmcurl/CMake/Platforms/WindowsCache.cmake
@@ -33,6 +33,7 @@ if(NOT UNIX)
       set(HAVE_UNISTD_H 1)
       set(HAVE_INTTYPES_H 1)
       set(HAVE_STRTOLL 1)
+      set(HAVE_BASENAME 1)
     elseif(MSVC)
       if(NOT MSVC_VERSION LESS 1800)
         set(HAVE_INTTYPES_H 1)
@@ -46,30 +47,32 @@ if(NOT UNIX)
       else()
         set(HAVE_SNPRINTF 0)
       endif()
+      set(HAVE_BASENAME 0)
     endif()
 
     set(HAVE_LIBSOCKET 0)
     set(HAVE_GETHOSTNAME 1)
     set(HAVE_LIBZ 0)
 
+    set(HAVE_ARC4RANDOM 0)
+    set(HAVE_FNMATCH 0)
+    set(HAVE_SCHED_YIELD 0)
     set(HAVE_ARPA_INET_H 0)
-    set(HAVE_ARPA_TFTP_H 0)
     set(HAVE_FCNTL_H 1)
     set(HAVE_IFADDRS_H 0)
     set(HAVE_IO_H 1)
     set(HAVE_NETDB_H 0)
     set(HAVE_NETINET_IN_H 0)
     set(HAVE_NETINET_TCP_H 0)
+    set(HAVE_NETINET_UDP_H 0)
     set(HAVE_NET_IF_H 0)
     set(HAVE_IOCTL_SIOCGIFADDR 0)
     set(HAVE_POLL_H 0)
+    set(HAVE_POLL_FINE 0)
     set(HAVE_PWD_H 0)
-    set(HAVE_SETJMP_H 1)
-    set(HAVE_SIGNAL_H 1)
-    set(HAVE_STDLIB_H 1)
     set(HAVE_STRINGS_H 0)
-    set(HAVE_STRING_H 1)
     set(HAVE_SYS_FILIO_H 0)
+    set(HAVE_SYS_WAIT_H 0)
     set(HAVE_SYS_IOCTL_H 0)
     set(HAVE_SYS_PARAM_H 0)
     set(HAVE_SYS_POLL_H 0)
@@ -84,14 +87,16 @@ if(NOT UNIX)
     set(HAVE_SYS_UTIME_H 1)
     set(HAVE_TERMIOS_H 0)
     set(HAVE_TERMIO_H 0)
-    set(HAVE_TIME_H 1)
     set(HAVE_UTIME_H 0)
 
+    set(HAVE_FSEEKO 0)
+    set(HAVE__FSEEKI64 1)
     set(HAVE_SOCKET 1)
     set(HAVE_SELECT 1)
     set(HAVE_STRDUP 1)
     set(HAVE_STRICMP 1)
     set(HAVE_STRCMPI 1)
+    set(HAVE_MEMRCHR 0)
     set(HAVE_GETTIMEOFDAY 0)
     set(HAVE_CLOSESOCKET 1)
     set(HAVE_SIGSETJMP 0)
@@ -101,11 +106,13 @@ if(NOT UNIX)
     set(HAVE_GETEUID 0)
     set(HAVE_UTIME 1)
     set(HAVE_GMTIME_R 0)
+    set(HAVE_CLOCK_GETTIME_MONOTONIC_RAW 0)
     set(HAVE_GETHOSTBYNAME_R 0)
     set(HAVE_SIGNAL 1)
     set(HAVE_LINUX_TCP_H 0)
     set(HAVE_GLIBC_STRERROR_R 0)
     set(HAVE_MACH_ABSOLUTE_TIME 0)
+    set(HAVE_GETIFADDRS 0)
 
     set(HAVE_GETHOSTBYNAME_R_3 0)
     set(HAVE_GETHOSTBYNAME_R_3_REENTRANT 0)
@@ -114,7 +121,6 @@ if(NOT UNIX)
     set(HAVE_GETHOSTBYNAME_R_6 0)
     set(HAVE_GETHOSTBYNAME_R_6_REENTRANT 0)
 
-    set(TIME_WITH_SYS_TIME 0)
     set(HAVE_O_NONBLOCK 0)
     set(HAVE_IN_ADDR_T 0)
     set(STDC_HEADERS 1)