Skip to content

Commit f20dc25

Browse files
authored
Merge pull request ClickHouse#90234 from ClickHouse/backport/25.8/90061
Backport ClickHouse#90061 to 25.8: Use `curl` 8.17.0
2 parents 42437b8 + 367907b commit f20dc25

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

contrib/curl

Submodule curl updated 2951 files

contrib/curl-cmake/CMakeLists.txt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ set (SRCS
1919
"${LIBRARY_DIR}/lib/cf-h2-proxy.c"
2020
"${LIBRARY_DIR}/lib/cf-haproxy.c"
2121
"${LIBRARY_DIR}/lib/cf-https-connect.c"
22+
"${LIBRARY_DIR}/lib/cf-ip-happy.c"
2223
"${LIBRARY_DIR}/lib/cf-socket.c"
2324
"${LIBRARY_DIR}/lib/cfilters.c"
2425
"${LIBRARY_DIR}/lib/conncache.c"
@@ -27,9 +28,9 @@ set (SRCS
2728
"${LIBRARY_DIR}/lib/cookie.c"
2829
"${LIBRARY_DIR}/lib/cshutdn.c"
2930
"${LIBRARY_DIR}/lib/curl_addrinfo.c"
30-
"${LIBRARY_DIR}/lib/curl_des.c"
3131
"${LIBRARY_DIR}/lib/curl_endian.c"
3232
"${LIBRARY_DIR}/lib/curl_fnmatch.c"
33+
"${LIBRARY_DIR}/lib/curl_fopen.c"
3334
"${LIBRARY_DIR}/lib/curl_get_line.c"
3435
"${LIBRARY_DIR}/lib/curl_gethostname.c"
3536
"${LIBRARY_DIR}/lib/curl_gssapi.c"
@@ -54,7 +55,6 @@ set (SRCS
5455
"${LIBRARY_DIR}/lib/fake_addrinfo.c"
5556
"${LIBRARY_DIR}/lib/file.c"
5657
"${LIBRARY_DIR}/lib/fileinfo.c"
57-
"${LIBRARY_DIR}/lib/fopen.c"
5858
"${LIBRARY_DIR}/lib/formdata.c"
5959
"${LIBRARY_DIR}/lib/ftp.c"
6060
"${LIBRARY_DIR}/lib/ftplistparser.c"
@@ -81,7 +81,6 @@ set (SRCS
8181
"${LIBRARY_DIR}/lib/idn.c"
8282
"${LIBRARY_DIR}/lib/if2ip.c"
8383
"${LIBRARY_DIR}/lib/imap.c"
84-
"${LIBRARY_DIR}/lib/krb5.c"
8584
"${LIBRARY_DIR}/lib/ldap.c"
8685
"${LIBRARY_DIR}/lib/llist.c"
8786
"${LIBRARY_DIR}/lib/macos.c"
@@ -93,6 +92,7 @@ set (SRCS
9392
"${LIBRARY_DIR}/lib/mqtt.c"
9493
"${LIBRARY_DIR}/lib/multi.c"
9594
"${LIBRARY_DIR}/lib/multi_ev.c"
95+
"${LIBRARY_DIR}/lib/multi_ntfy.c"
9696
"${LIBRARY_DIR}/lib/netrc.c"
9797
"${LIBRARY_DIR}/lib/noproxy.c"
9898
"${LIBRARY_DIR}/lib/openldap.c"
@@ -170,16 +170,18 @@ set (SRCS
170170
"${LIBRARY_DIR}/lib/vtls/x509asn1.c"
171171
"${LIBRARY_DIR}/lib/curlx/base64.c"
172172
"${LIBRARY_DIR}/lib/curlx/dynbuf.c"
173+
"${LIBRARY_DIR}/lib/curlx/fopen.c"
173174
"${LIBRARY_DIR}/lib/curlx/inet_ntop.c"
174175
"${LIBRARY_DIR}/lib/curlx/inet_pton.c"
175176
"${LIBRARY_DIR}/lib/curlx/multibyte.c"
176177
"${LIBRARY_DIR}/lib/curlx/nonblock.c"
178+
"${LIBRARY_DIR}/lib/curlx/strerr.c"
177179
"${LIBRARY_DIR}/lib/curlx/strparse.c"
178180
"${LIBRARY_DIR}/lib/curlx/timediff.c"
179181
"${LIBRARY_DIR}/lib/curlx/timeval.c"
180182
"${LIBRARY_DIR}/lib/curlx/version_win32.c"
181-
"${LIBRARY_DIR}/lib/curlx/warnless.c"
182183
"${LIBRARY_DIR}/lib/curlx/wait.c"
184+
"${LIBRARY_DIR}/lib/curlx/warnless.c"
183185
"${LIBRARY_DIR}/lib/curlx/winapi.c"
184186
)
185187

0 commit comments

Comments
 (0)