Skip to content

Commit 011dce7

Browse files
author
Git for Windows Build Agent
committed
Update 4 packages
curl (8.10.1-1 -> 8.11.0-1) libcurl (8.10.1-1 -> 8.11.0-1) mingw-w64-i686-curl-openssl-alternate (8.10.1-1 -> 8.11.0-1) mingw-w64-i686-curl-winssl (8.10.1-1 -> 8.11.0-1) Signed-off-by: Git for Windows Build Agent <[email protected]>
1 parent 0ebdf28 commit 011dce7

File tree

1,038 files changed

+75
-77
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,038 files changed

+75
-77
lines changed

etc/rebase.db.i386

0 Bytes
Binary file not shown.

mingw32/bin/curl-config

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525

2626
# shellcheck disable=SC2006
2727

28-
prefix="/mingw32"
29-
# Used in ${exec_prefix}/lib
28+
prefix='/mingw32'
29+
# Used in 'libdir'
3030
# shellcheck disable=SC2034
31-
exec_prefix=${prefix}
31+
exec_prefix="${prefix}"
3232
# shellcheck disable=SC2034
33-
includedir=${prefix}/include
34-
cppflag_curl_staticlib=
33+
includedir="${prefix}/include"
34+
cppflag_curl_staticlib=''
3535

3636
usage()
3737
{
@@ -83,36 +83,36 @@ while test "$#" -gt 0; do
8383
;;
8484

8585
--feature|--features)
86-
for feature in alt-svc AsynchDNS brotli HSTS HTTPS-proxy IDN IPv6 Kerberos Largefile libz NTLM PSL SPNEGO SSL SSPI threadsafe UnixSockets zstd ""; do
86+
for feature in alt-svc AsynchDNS brotli HSTS HTTPS-proxy IDN IPv6 Kerberos Largefile libz NTLM PSL SPNEGO SSL SSPI threadsafe UnixSockets zstd ''; do
8787
test -n "$feature" && echo "$feature"
8888
done
8989
;;
9090

9191
--protocols)
9292
# shellcheck disable=SC2043
93-
for protocol in DICT FILE FTP FTPS GOPHER GOPHERS HTTP HTTPS IMAP IMAPS IPFS IPNS LDAP LDAPS MQTT POP3 POP3S RTSP SCP SFTP SMB SMBS SMTP SMTPS TELNET TFTP; do
93+
for protocol in DICT FILE FTP FTPS GOPHER GOPHERS HTTP HTTPS IMAP IMAPS IPFS IPNS LDAP LDAPS MQTT POP3 POP3S RTSP SCP SFTP SMB SMBS SMTP SMTPS TELNET TFTP WS WSS; do
9494
echo "$protocol"
9595
done
9696
;;
9797

9898
--version)
99-
echo 'libcurl 8.10.1'
99+
echo 'libcurl 8.11.0'
100100
exit 0
101101
;;
102102

103103
--checkfor)
104-
checkfor=$2
104+
checkfor="$2"
105105
cmajor=`echo "$checkfor" | cut -d. -f1`
106106
cminor=`echo "$checkfor" | cut -d. -f2`
107107
# when extracting the patch part we strip off everything after a
108108
# dash as that's used for things like version 1.2.3-pre1
109109
cpatch=`echo "$checkfor" | cut -d. -f3 | cut -d- -f1`
110110

111-
vmajor=`echo '8.10.1' | cut -d. -f1`
112-
vminor=`echo '8.10.1' | cut -d. -f2`
111+
vmajor=`echo '8.11.0' | cut -d. -f1`
112+
vminor=`echo '8.11.0' | cut -d. -f2`
113113
# when extracting the patch part we strip off everything after a
114114
# dash as that's used for things like version 1.2.3-pre1
115-
vpatch=`echo '8.10.1' | cut -d. -f3 | cut -d- -f1`
115+
vpatch=`echo '8.11.0' | cut -d. -f3 | cut -d- -f1`
116116

117117
if test "$vmajor" -gt "$cmajor"; then
118118
exit 0
@@ -128,12 +128,12 @@ while test "$#" -gt 0; do
128128
fi
129129
fi
130130

131-
echo "requested version $checkfor is newer than existing 8.10.1"
131+
echo "requested version $checkfor is newer than existing 8.11.0"
132132
exit 1
133133
;;
134134

135135
--vernum)
136-
echo '080a01'
136+
echo '080b00'
137137
exit 0
138138
;;
139139

@@ -142,25 +142,25 @@ while test "$#" -gt 0; do
142142
;;
143143

144144
--cflags)
145-
if test "X$cppflag_curl_staticlib" = "X-DCURL_STATICLIB"; then
146-
CPPFLAG_CURL_STATICLIB="-DCURL_STATICLIB "
145+
if test "X$cppflag_curl_staticlib" = 'X-DCURL_STATICLIB'; then
146+
CPPFLAG_CURL_STATICLIB='-DCURL_STATICLIB '
147147
else
148-
CPPFLAG_CURL_STATICLIB=""
148+
CPPFLAG_CURL_STATICLIB=''
149149
fi
150-
if test "X${prefix}/include" = "X/usr/include"; then
150+
if test "X${prefix}/include" = 'X/usr/include'; then
151151
echo "${CPPFLAG_CURL_STATICLIB}"
152152
else
153153
echo "${CPPFLAG_CURL_STATICLIB}-I${prefix}/include"
154154
fi
155155
;;
156156

157157
--libs)
158-
if test "X${exec_prefix}/lib" != "X/usr/lib" -a "X${exec_prefix}/lib" != "X/usr/lib64"; then
158+
if test "X${exec_prefix}/lib" != 'X/usr/lib' -a "X${exec_prefix}/lib" != 'X/usr/lib64'; then
159159
CURLLIBDIR="-L${exec_prefix}/lib "
160160
else
161-
CURLLIBDIR=""
161+
CURLLIBDIR=''
162162
fi
163-
if test "Xyes" = "Xno"; then
163+
if test 'Xyes' = 'Xno'; then
164164
echo "${CURLLIBDIR}-lcurl -lidn2 -lssh2 -lssh2 -lpsl -lbcrypt -ladvapi32 -lcrypt32 -lwldap32 -lzstd -lzstd -lbrotlidec -lbrotlidec -lz -lws2_32"
165165
else
166166
echo "${CURLLIBDIR}-lcurl"
@@ -172,8 +172,8 @@ while test "$#" -gt 0; do
172172
;;
173173

174174
--static-libs)
175-
if test "Xno" != "Xno" ; then
176-
echo "${exec_prefix}/lib/libcurl.a" -Wl,--no-seh -Wl,--large-address-aware -lidn2 -lssh2 -lssh2 -lpsl -lbcrypt -ladvapi32 -lcrypt32 -lwldap32 -lzstd -lzstd -lbrotlidec -lbrotlidec -lz -lws2_32
175+
if test 'Xno' != 'Xno'; then
176+
echo "${exec_prefix}/lib/libcurl.a -Wl,--no-seh -Wl,--large-address-aware -lidn2 -lssh2 -lssh2 -lpsl -lbcrypt -ladvapi32 -lcrypt32 -lwldap32 -lzstd -lzstd -lbrotlidec -lbrotlidec -lz -lws2_32"
177177
else
178178
echo 'curl was built with static libraries disabled' >&2
179179
exit 1

mingw32/bin/curl.exe

3 KB
Binary file not shown.

mingw32/bin/libcurl-4.dll

11 KB
Binary file not shown.

mingw32/bin/libcurl-openssl-4.dll

10.5 KB
Binary file not shown.

mingw32/include/curl/curl.h

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,15 @@
3030
*/
3131

3232
#ifdef CURL_NO_OLDIES
33-
#define CURL_STRICTER
33+
#define CURL_STRICTER /* not used since 8.11.0 */
3434
#endif
3535

3636
/* Compile-time deprecation macros. */
37-
#if (defined(__GNUC__) && \
38-
((__GNUC__ > 12) || ((__GNUC__ == 12) && (__GNUC_MINOR__ >= 1 ))) || \
39-
defined(__IAR_SYSTEMS_ICC__)) && \
40-
!defined(__INTEL_COMPILER) && \
37+
#if (defined(__GNUC__) && \
38+
((__GNUC__ > 12) || ((__GNUC__ == 12) && (__GNUC_MINOR__ >= 1))) || \
39+
(defined(__clang__) && __clang_major__ >= 3) || \
40+
defined(__IAR_SYSTEMS_ICC__)) && \
41+
!defined(__INTEL_COMPILER) && \
4142
!defined(CURL_DISABLE_DEPRECATION) && !defined(BUILDING_LIBCURL)
4243
#define CURL_DEPRECATED(version, message) \
4344
__attribute__((deprecated("since " # version ". " message)))
@@ -113,13 +114,8 @@
113114
extern "C" {
114115
#endif
115116

116-
#if defined(BUILDING_LIBCURL) || defined(CURL_STRICTER)
117-
typedef struct Curl_easy CURL;
118-
typedef struct Curl_share CURLSH;
119-
#else
120117
typedef void CURL;
121118
typedef void CURLSH;
122-
#endif
123119

124120
/*
125121
* libcurl external API function linkage decorations.
@@ -253,12 +249,12 @@ typedef int (*curl_xferinfo_callback)(void *clientp,
253249
#endif
254250

255251
#ifndef CURL_MAX_WRITE_SIZE
256-
/* Tests have proven that 20K is a very bad buffer size for uploads on
257-
Windows, while 16K for some odd reason performed a lot better.
258-
We do the ifndef check to allow this value to easier be changed at build
259-
time for those who feel adventurous. The practical minimum is about
260-
400 bytes since libcurl uses a buffer of this size as a scratch area
261-
(unrelated to network send operations). */
252+
/* Tests have proven that 20K is a bad buffer size for uploads on Windows,
253+
while 16K for some odd reason performed a lot better. We do the ifndef
254+
check to allow this value to easier be changed at build time for those
255+
who feel adventurous. The practical minimum is about 400 bytes since
256+
libcurl uses a buffer of this size as a scratch area (unrelated to
257+
network send operations). */
262258
#define CURL_MAX_WRITE_SIZE 16384
263259
#endif
264260

@@ -942,6 +938,9 @@ typedef enum {
942938
a client certificate for authentication. (Schannel) */
943939
#define CURLSSLOPT_AUTO_CLIENT_CERT (1<<5)
944940

941+
/* If possible, send data using TLS 1.3 early data */
942+
#define CURLSSLOPT_EARLYDATA (1<<6)
943+
945944
/* The default connection attempt delay in milliseconds for happy eyeballs.
946945
CURLOPT_HAPPY_EYEBALLS_TIMEOUT_MS.3 and happy-eyeballs-timeout-ms.d document
947946
this value, keep them in sync. */
@@ -2953,7 +2952,8 @@ typedef enum {
29532952
CURLINFO_QUEUE_TIME_T = CURLINFO_OFF_T + 65,
29542953
CURLINFO_USED_PROXY = CURLINFO_LONG + 66,
29552954
CURLINFO_POSTTRANSFER_TIME_T = CURLINFO_OFF_T + 67,
2956-
CURLINFO_LASTONE = 67
2955+
CURLINFO_EARLYDATA_SENT_T = CURLINFO_OFF_T + 68,
2956+
CURLINFO_LASTONE = 68
29572957
} CURLINFO;
29582958

29592959
/* CURLINFO_RESPONSE_CODE is the new name for the option previously known as

mingw32/include/curl/curlver.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@
3232

3333
/* This is the version number of the libcurl package from which this header
3434
file origins: */
35-
#define LIBCURL_VERSION "8.10.1"
35+
#define LIBCURL_VERSION "8.11.0"
3636

3737
/* The numeric version number is also available "in parts" by using these
3838
defines: */
3939
#define LIBCURL_VERSION_MAJOR 8
40-
#define LIBCURL_VERSION_MINOR 10
41-
#define LIBCURL_VERSION_PATCH 1
40+
#define LIBCURL_VERSION_MINOR 11
41+
#define LIBCURL_VERSION_PATCH 0
4242

4343
/* This is the numeric version of the libcurl version number, meant for easier
4444
parsing and comparisons by programs. The LIBCURL_VERSION_NUM define will
@@ -59,7 +59,7 @@
5959
CURL_VERSION_BITS() macro since curl's own configure script greps for it
6060
and needs it to contain the full number.
6161
*/
62-
#define LIBCURL_VERSION_NUM 0x080a01
62+
#define LIBCURL_VERSION_NUM 0x080b00
6363

6464
/*
6565
* This is the date and time when the full source package was created. The
@@ -70,7 +70,7 @@
7070
*
7171
* "2007-11-23"
7272
*/
73-
#define LIBCURL_TIMESTAMP "2024-09-18"
73+
#define LIBCURL_TIMESTAMP "2024-11-06"
7474

7575
#define CURL_VERSION_BITS(x,y,z) ((x)<<16|(y)<<8|(z))
7676
#define CURL_AT_LEAST_VERSION(x,y,z) \

mingw32/include/curl/multi.h

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,7 @@
5454
extern "C" {
5555
#endif
5656

57-
#if defined(BUILDING_LIBCURL) || defined(CURL_STRICTER)
58-
typedef struct Curl_multi CURLM;
59-
#else
6057
typedef void CURLM;
61-
#endif
6258

6359
typedef enum {
6460
CURLM_CALL_MULTI_PERFORM = -1, /* please call curl_multi_perform() or
@@ -248,13 +244,13 @@ CURL_EXTERN CURLMcode curl_multi_cleanup(CURLM *multi_handle);
248244
* The data the returned pointer points to will not survive calling
249245
* curl_multi_cleanup().
250246
*
251-
* The 'CURLMsg' struct is meant to be very simple and only contain
252-
* very basic information. If more involved information is wanted,
253-
* we will provide the particular "transfer handle" in that struct
254-
* and that should/could/would be used in subsequent
255-
* curl_easy_getinfo() calls (or similar). The point being that we
256-
* must never expose complex structs to applications, as then we will
257-
* undoubtably get backwards compatibility problems in the future.
247+
* The 'CURLMsg' struct is meant to be simple and only contain basic
248+
* information. If more involved information is wanted, we will
249+
* provide the particular "transfer handle" in that struct and that
250+
* should/could/would be used in subsequent curl_easy_getinfo() calls
251+
* (or similar). The point being that we must never expose complex
252+
* structs to applications, as then we will undoubtably get backwards
253+
* compatibility problems in the future.
258254
*
259255
* Returns: A pointer to a filled-in struct, or NULL if it failed or ran out
260256
* of structs. It also writes the number of messages left in the

mingw32/lib/pkgconfig/libcurl.pc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,16 @@ prefix=/mingw32
2626
exec_prefix=${prefix}
2727
libdir=${exec_prefix}/lib
2828
includedir=${prefix}/include
29-
supported_protocols="DICT FILE FTP FTPS GOPHER GOPHERS HTTP HTTPS IMAP IMAPS IPFS IPNS LDAP LDAPS MQTT POP3 POP3S RTSP SCP SFTP SMB SMBS SMTP SMTPS TELNET TFTP"
29+
supported_protocols="DICT FILE FTP FTPS GOPHER GOPHERS HTTP HTTPS IMAP IMAPS IPFS IPNS LDAP LDAPS MQTT POP3 POP3S RTSP SCP SFTP SMB SMBS SMTP SMTPS TELNET TFTP WS WSS"
3030
supported_features="alt-svc AsynchDNS brotli HSTS HTTPS-proxy IDN IPv6 Kerberos Largefile libz NTLM PSL SPNEGO SSL SSPI threadsafe UnixSockets zstd"
3131

3232
Name: libcurl
3333
URL: https://curl.se/
34-
Description: Library to transfer files with ftp, http, etc.
35-
Version: 8.10.1
34+
Description: Library to transfer files with HTTP, FTP, etc.
35+
Version: 8.11.0
3636
Requires:
3737
Requires.private: libidn2,zlib,libbrotlidec,libzstd,libpsl,libssh2
3838
Libs: -L${libdir} -lcurl
39-
Libs.private: -lidn2 -lssh2 -lssh2 -lpsl -lbcrypt -ladvapi32 -lcrypt32 -lwldap32 -lzstd -lzstd -lbrotlidec -lbrotlidec -lz -lws2_32
39+
Libs.private: -Wl,--no-seh -Wl,--large-address-aware -lidn2 -lssh2 -lssh2 -lpsl -lbcrypt -ladvapi32 -lcrypt32 -lwldap32 -lzstd -lzstd -lbrotlidec -lbrotlidec -lz -lws2_32
4040
Cflags: -I${includedir}
4141
Cflags.private: -DCURL_STATICLIB
0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)