Skip to content

Commit f03ab36

Browse files
author
Git for Windows Build Agent
committed
Update 6 packages
curl (8.11.1-1 -> 8.12.0-1) libcurl (8.11.1-1 -> 8.12.0-1) mingw-w64-i686-curl-openssl-alternate (8.11.1-1 -> 8.12.0-1) mingw-w64-i686-curl-winssl (8.11.1-1 -> 8.12.0-1) mingw-w64-x86_64-curl-openssl-alternate (8.11.1-1 -> 8.12.0-1) mingw-w64-x86_64-curl-winssl (8.11.1-1 -> 8.12.0-1) Signed-off-by: Git for Windows Build Agent <[email protected]>
1 parent f845bb7 commit f03ab36

File tree

1,587 files changed

+256
-276
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,587 files changed

+256
-276
lines changed

mingw32/bin/curl-config

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ prefix='/mingw32'
3131
exec_prefix="${prefix}"
3232
# shellcheck disable=SC2034
3333
includedir="${prefix}/include"
34-
cppflag_curl_staticlib=''
3534

3635
usage()
3736
{
@@ -96,7 +95,7 @@ while test "$#" -gt 0; do
9695
;;
9796

9897
--version)
99-
echo 'libcurl 8.11.1'
98+
echo 'libcurl 8.12.0'
10099
exit 0
101100
;;
102101

@@ -108,11 +107,11 @@ while test "$#" -gt 0; do
108107
# dash as that's used for things like version 1.2.3-pre1
109108
cpatch=`echo "$checkfor" | cut -d. -f3 | cut -d- -f1`
110109

111-
vmajor=`echo '8.11.1' | cut -d. -f1`
112-
vminor=`echo '8.11.1' | cut -d. -f2`
110+
vmajor=`echo '8.12.0' | cut -d. -f1`
111+
vminor=`echo '8.12.0' | cut -d. -f2`
113112
# when extracting the patch part we strip off everything after a
114113
# dash as that's used for things like version 1.2.3-pre1
115-
vpatch=`echo '8.11.1' | cut -d. -f3 | cut -d- -f1`
114+
vpatch=`echo '8.12.0' | cut -d. -f3 | cut -d- -f1`
116115

117116
if test "$vmajor" -gt "$cmajor"; then
118117
exit 0
@@ -128,12 +127,12 @@ while test "$#" -gt 0; do
128127
fi
129128
fi
130129

131-
echo "requested version $checkfor is newer than existing 8.11.1"
130+
echo "requested version $checkfor is newer than existing 8.12.0"
132131
exit 1
133132
;;
134133

135134
--vernum)
136-
echo '080b01'
135+
echo '080c00'
137136
exit 0
138137
;;
139138

@@ -142,28 +141,23 @@ while test "$#" -gt 0; do
142141
;;
143142

144143
--cflags)
145-
if test "X$cppflag_curl_staticlib" = 'X-DCURL_STATICLIB'; then
146-
CPPFLAG_CURL_STATICLIB='-DCURL_STATICLIB '
147-
else
148-
CPPFLAG_CURL_STATICLIB=''
149-
fi
150144
if test "X${prefix}/include" = 'X/usr/include'; then
151-
echo "${CPPFLAG_CURL_STATICLIB}"
145+
echo ''
152146
else
153-
echo "${CPPFLAG_CURL_STATICLIB}-I${prefix}/include"
147+
echo " -I${prefix}/include"
154148
fi
155149
;;
156150

157151
--libs)
158152
if test "X${exec_prefix}/lib" != 'X/usr/lib' -a "X${exec_prefix}/lib" != 'X/usr/lib64'; then
159-
CURLLIBDIR="-L${exec_prefix}/lib "
153+
curllibdir="-L${exec_prefix}/lib "
160154
else
161-
CURLLIBDIR=''
155+
curllibdir=''
162156
fi
163157
if test 'Xyes' = 'Xno'; then
164-
echo "${CURLLIBDIR}-lcurl -lidn2 -lssh2 -lssh2 -lpsl -lbcrypt -ladvapi32 -lcrypt32 -lwldap32 -lzstd -lzstd -lbrotlidec -lbrotlidec -lz -lws2_32"
158+
echo "${curllibdir}-lcurl -lidn2 -lssh2 -lssh2 -lpsl -lbcrypt -ladvapi32 -lcrypt32 -lwldap32 -lzstd -lzstd -lbrotlidec -lbrotlidec -lz -lws2_32"
165159
else
166-
echo "${CURLLIBDIR}-lcurl"
160+
echo "${curllibdir}-lcurl"
167161
fi
168162
;;
169163

mingw32/bin/curl.exe

9 KB
Binary file not shown.

mingw32/bin/libcurl-4.dll

-26.5 KB
Binary file not shown.

mingw32/bin/libcurl-openssl-4.dll

-26 KB
Binary file not shown.

mingw32/include/curl/curl.h

Lines changed: 49 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1959,10 +1959,10 @@ typedef enum {
19591959
/* Set stream weight, 1 - 256 (default is 16) */
19601960
CURLOPT(CURLOPT_STREAM_WEIGHT, CURLOPTTYPE_LONG, 239),
19611961

1962-
/* Set stream dependency on another CURL handle */
1962+
/* Set stream dependency on another curl handle */
19631963
CURLOPT(CURLOPT_STREAM_DEPENDS, CURLOPTTYPE_OBJECTPOINT, 240),
19641964

1965-
/* Set E-xclusive stream dependency on another CURL handle */
1965+
/* Set E-xclusive stream dependency on another curl handle */
19661966
CURLOPT(CURLOPT_STREAM_DEPENDS_E, CURLOPTTYPE_OBJECTPOINT, 241),
19671967

19681968
/* Do not send any tftp option requests to the server */
@@ -2959,7 +2959,9 @@ typedef enum {
29592959
CURLINFO_USED_PROXY = CURLINFO_LONG + 66,
29602960
CURLINFO_POSTTRANSFER_TIME_T = CURLINFO_OFF_T + 67,
29612961
CURLINFO_EARLYDATA_SENT_T = CURLINFO_OFF_T + 68,
2962-
CURLINFO_LASTONE = 68
2962+
CURLINFO_HTTPAUTH_USED = CURLINFO_LONG + 69,
2963+
CURLINFO_PROXYAUTH_USED = CURLINFO_LONG + 70,
2964+
CURLINFO_LASTONE = 70
29632965
} CURLINFO;
29642966

29652967
/* CURLINFO_RESPONSE_CODE is the new name for the option previously known as
@@ -3230,6 +3232,50 @@ CURL_EXTERN CURLcode curl_easy_pause(CURL *handle, int bitmask);
32303232
#define CURLPAUSE_ALL (CURLPAUSE_RECV|CURLPAUSE_SEND)
32313233
#define CURLPAUSE_CONT (CURLPAUSE_RECV_CONT|CURLPAUSE_SEND_CONT)
32323234

3235+
/*
3236+
* NAME curl_easy_ssls_import()
3237+
*
3238+
* DESCRIPTION
3239+
*
3240+
* The curl_easy_ssls_import function adds a previously exported SSL session
3241+
* to the SSL session cache of the easy handle (or the underlying share).
3242+
*/
3243+
CURL_EXTERN CURLcode curl_easy_ssls_import(CURL *handle,
3244+
const char *session_key,
3245+
const unsigned char *shmac,
3246+
size_t shmac_len,
3247+
const unsigned char *sdata,
3248+
size_t sdata_len);
3249+
3250+
/* This is the curl_ssls_export_cb callback prototype. It
3251+
* is passed to curl_easy_ssls_export() to extract SSL sessions/tickets. */
3252+
typedef CURLcode curl_ssls_export_cb(CURL *handle,
3253+
void *userptr,
3254+
const char *session_key,
3255+
const unsigned char *shmac,
3256+
size_t shmac_len,
3257+
const unsigned char *sdata,
3258+
size_t sdata_len,
3259+
curl_off_t valid_until,
3260+
int ietf_tls_id,
3261+
const char *alpn,
3262+
size_t earlydata_max);
3263+
3264+
/*
3265+
* NAME curl_easy_ssls_export()
3266+
*
3267+
* DESCRIPTION
3268+
*
3269+
* The curl_easy_ssls_export function iterates over all SSL sessions stored
3270+
* in the easy handle (or underlying share) and invokes the passed
3271+
* callback.
3272+
*
3273+
*/
3274+
CURL_EXTERN CURLcode curl_easy_ssls_export(CURL *handle,
3275+
curl_ssls_export_cb *export_fn,
3276+
void *userptr);
3277+
3278+
32333279
#ifdef __cplusplus
32343280
} /* end of extern "C" */
32353281
#endif

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.11.1"
35+
#define LIBCURL_VERSION "8.12.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 11
41-
#define LIBCURL_VERSION_PATCH 1
40+
#define LIBCURL_VERSION_MINOR 12
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 0x080b01
62+
#define LIBCURL_VERSION_NUM 0x080c00
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-12-11"
73+
#define LIBCURL_TIMESTAMP "2025-02-05"
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/easy.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ CURL_EXTERN CURL *curl_easy_duphandle(CURL *curl);
7878
*
7979
* DESCRIPTION
8080
*
81-
* Re-initializes a CURL handle to the default values. This puts back the
81+
* Re-initializes a curl handle to the default values. This puts back the
8282
* handle to the same state as it was in when it was just created.
8383
*
8484
* It does keep: live connections, the Session ID cache, the DNS cache and the

0 commit comments

Comments
 (0)