Skip to content

Commit 2df47c2

Browse files
committed
Update curl from 7.64.0 to 7.64.1
1 parent 6abdbe4 commit 2df47c2

Some content is hidden

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

95 files changed

+8457
-7252
lines changed

vendor/curl/CHANGES

Lines changed: 5609 additions & 5346 deletions
Large diffs are not rendered by default.

vendor/curl/RELEASE-NOTES

Lines changed: 232 additions & 169 deletions
Large diffs are not rendered by default.

vendor/curl/include/curl/curl.h

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* | (__| |_| | _ <| |___
88
* \___|\___/|_| \_\_____|
99
*
10-
* Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.
10+
* Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.
1111
*
1212
* This software is licensed as described in the file COPYING, which
1313
* you should have received as part of this distribution. The terms
@@ -91,6 +91,11 @@
9191
#include <support/SupportDefs.h>
9292
#endif
9393

94+
/* Compatibility for non-Clang compilers */
95+
#ifndef __has_declspec_attribute
96+
# define __has_declspec_attribute(x) 0
97+
#endif
98+
9499
#ifdef __cplusplus
95100
extern "C" {
96101
#endif
@@ -109,7 +114,9 @@ typedef void CURLSH;
109114

110115
#ifdef CURL_STATICLIB
111116
# define CURL_EXTERN
112-
#elif defined(WIN32) || defined(_WIN32) || defined(__SYMBIAN32__)
117+
#elif defined(WIN32) || defined(_WIN32) || defined(__SYMBIAN32__) || \
118+
(__has_declspec_attribute(dllexport) && \
119+
__has_declspec_attribute(dllimport))
113120
# if defined(BUILDING_LIBCURL)
114121
# define CURL_EXTERN __declspec(dllexport)
115122
# else
@@ -144,7 +151,7 @@ typedef enum {
144151
CURLSSLBACKEND_POLARSSL = 6,
145152
CURLSSLBACKEND_WOLFSSL = 7,
146153
CURLSSLBACKEND_SCHANNEL = 8,
147-
CURLSSLBACKEND_DARWINSSL = 9,
154+
CURLSSLBACKEND_SECURETRANSPORT = 9,
148155
CURLSSLBACKEND_AXTLS = 10, /* never used since 7.63.0 */
149156
CURLSSLBACKEND_MBEDTLS = 11,
150157
CURLSSLBACKEND_MESALINK = 12
@@ -153,7 +160,10 @@ typedef enum {
153160
/* aliases for library clones and renames */
154161
#define CURLSSLBACKEND_LIBRESSL CURLSSLBACKEND_OPENSSL
155162
#define CURLSSLBACKEND_BORINGSSL CURLSSLBACKEND_OPENSSL
163+
164+
/* deprecated names: */
156165
#define CURLSSLBACKEND_CYASSL CURLSSLBACKEND_WOLFSSL
166+
#define CURLSSLBACKEND_DARWINSSL CURLSSLBACKEND_SECURETRANSPORT
157167

158168
struct curl_httppost {
159169
struct curl_httppost *next; /* next entry in the list */
@@ -871,6 +881,14 @@ typedef enum {
871881
#define CURLHEADER_UNIFIED 0
872882
#define CURLHEADER_SEPARATE (1<<0)
873883

884+
/* CURLALTSVC_* are bits for the CURLOPT_ALTSVC_CTRL option */
885+
#define CURLALTSVC_IMMEDIATELY (1<<0)
886+
#define CURLALTSVC_ALTUSED (1<<1)
887+
#define CURLALTSVC_READONLYFILE (1<<2)
888+
#define CURLALTSVC_H1 (1<<3)
889+
#define CURLALTSVC_H2 (1<<4)
890+
#define CURLALTSVC_H3 (1<<5)
891+
874892
/* CURLPROTO_ defines are for the CURLOPT_*PROTOCOLS options */
875893
#define CURLPROTO_HTTP (1<<0)
876894
#define CURLPROTO_HTTPS (1<<1)
@@ -1894,6 +1912,12 @@ typedef enum {
18941912
/* set this to 1L to allow HTTP/0.9 responses or 0L to disallow */
18951913
CINIT(HTTP09_ALLOWED, LONG, 285),
18961914

1915+
/* alt-svc control bitmask */
1916+
CINIT(ALTSVC_CTRL, LONG, 286),
1917+
1918+
/* alt-svc cache file name to possibly read from/write to */
1919+
CINIT(ALTSVC, STRINGPOINT, 287),
1920+
18971921
CURLOPT_LASTENTRY /* the last unused */
18981922
} CURLoption;
18991923

@@ -2756,6 +2780,7 @@ typedef struct {
27562780
#define CURL_VERSION_HTTPS_PROXY (1<<21) /* HTTPS-proxy support built-in */
27572781
#define CURL_VERSION_MULTI_SSL (1<<22) /* Multiple SSL backends available */
27582782
#define CURL_VERSION_BROTLI (1<<23) /* Brotli features are present. */
2783+
#define CURL_VERSION_ALTSVC (1<<24) /* Alt-Svc handling built-in */
27592784

27602785
/*
27612786
* NAME curl_version_info()

vendor/curl/include/curl/curlver.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* | (__| |_| | _ <| |___
88
* \___|\___/|_| \_\_____|
99
*
10-
* Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.
10+
* Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.
1111
*
1212
* This software is licensed as described in the file COPYING, which
1313
* you should have received as part of this distribution. The terms
@@ -26,17 +26,17 @@
2626
a script at release-time. This was made its own header file in 7.11.2 */
2727

2828
/* This is the global package copyright */
29-
#define LIBCURL_COPYRIGHT "1996 - 2018 Daniel Stenberg, <daniel@haxx.se>."
29+
#define LIBCURL_COPYRIGHT "1996 - 2019 Daniel Stenberg, <daniel@haxx.se>."
3030

3131
/* This is the version number of the libcurl package from which this header
3232
file origins: */
33-
#define LIBCURL_VERSION "7.64.0"
33+
#define LIBCURL_VERSION "7.64.1"
3434

3535
/* The numeric version number is also available "in parts" by using these
3636
defines: */
3737
#define LIBCURL_VERSION_MAJOR 7
3838
#define LIBCURL_VERSION_MINOR 64
39-
#define LIBCURL_VERSION_PATCH 0
39+
#define LIBCURL_VERSION_PATCH 1
4040

4141
/* This is the numeric version of the libcurl version number, meant for easier
4242
parsing and comparions by programs. The LIBCURL_VERSION_NUM define will
@@ -57,7 +57,7 @@
5757
CURL_VERSION_BITS() macro since curl's own configure script greps for it
5858
and needs it to contain the full number.
5959
*/
60-
#define LIBCURL_VERSION_NUM 0x074000
60+
#define LIBCURL_VERSION_NUM 0x074001
6161

6262
/*
6363
* This is the date and time when the full source package was created. The
@@ -68,7 +68,7 @@
6868
*
6969
* "2007-11-23"
7070
*/
71-
#define LIBCURL_TIMESTAMP "2019-02-06"
71+
#define LIBCURL_TIMESTAMP "2019-03-27"
7272

7373
#define CURL_VERSION_BITS(x,y,z) ((x)<<16|(y)<<8|z)
7474
#define CURL_AT_LEAST_VERSION(x,y,z) \

vendor/curl/include/curl/typecheck-gcc.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* | (__| |_| | _ <| |___
88
* \___|\___/|_| \_\_____|
99
*
10-
* Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.
10+
* Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.
1111
*
1212
* This software is licensed as described in the file COPYING, which
1313
* you should have received as part of this distribution. The terms
@@ -256,6 +256,7 @@ _CURL_WARNING(_curl_easy_getinfo_err_curl_off_t,
256256
#define _curl_is_string_option(option) \
257257
((option) == CURLOPT_ABSTRACT_UNIX_SOCKET || \
258258
(option) == CURLOPT_ACCEPT_ENCODING || \
259+
(option) == CURLOPT_ALTSVC || \
259260
(option) == CURLOPT_CAINFO || \
260261
(option) == CURLOPT_CAPATH || \
261262
(option) == CURLOPT_COOKIE || \

0 commit comments

Comments
 (0)