Update curl from 7.65.1 to 7.65.3 (#1027)

* Update curl from 7.65.1 to 7.65.2

* Update curl from 7.65.2 to 7.65.3

Author: patrikjuvonen

vendor/curl/CHANGES

@@ -1,48 +1,14 @@
-curl and libcurl 7.65.1
+curl and libcurl 7.65.3
 
- Public curl releases:         182
+ Public curl releases:         184
  Command line options:         221
  curl_easy_setopt() options:   268
  Public functions in libcurl:  80
- Contributors:                 1965
+ Contributors:                 1991
 
 This release includes the following bugfixes:
 
- o CURLOPT_LOW_SPEED_* repaired [6]
- o NTLM: reset proxy "multipass" state when CONNECT request is done [32]
- o PolarSSL: deprecate support step 1. Removed from configure [3]
- o appveyor: add Visual Studio solution build [25]
- o cmake: check for if_nametoindex() [2]
- o cmake: support CMAKE_OSX_ARCHITECTURES when detecting SIZEOF variables [17]
- o config-win32: add support for if_nametoindex and getsockname [8]
- o conncache: Remove the DEBUGASSERT on length check [27]
- o conncache: make "bundles" per host name when doing proxy tunnels [21]
- o curl-win32.h: Enable Unix Domain Sockets based on the Windows SDK version [16]
- o curl_share_setopt.3: improve wording [34]
- o dump-header.d: spell out that no headers == empty file [30]
- o example/http2-download: fix format specifier [4]
- o examples: cleanups and compiler warning fixes [4]
- o http2: Stop drain from being permanently set [26]
- o http: don't parse body-related headers in bodyless responses [28]
- o md4: build correctly with openssl without MD4 [9]
- o md4: include the mbedtls config.h to get the MD4 info [10]
- o multi: track users of a socket better [15]
- o nss: allow to specify TLS 1.3 ciphers if supported by NSS [20]
- o parse_proxy: make sure portptr is initialized [23]
- o parse_proxy: use the IPv6 zone id if given [1]
- o sectransp: handle errSSLPeerAuthCompleted from SSLRead() [13]
- o singlesocket: use separate variable for inner loop [31]
- o ssl: Update outdated "openssl-only" comments for supported backends [33]
- o tests: add HAProxy keywords [18]
- o tests: add support to test against OpenSSH for Windows [5]
- o tests: make test 1420 and 1406 work with rtsp-disabled libcurl [19]
- o tls13-docs: mention it is only for OpenSSL >= 1.1.1 [29]
- o tool_parse_cfg: Avoid 2 fopen() for WIN32
- o tool_setopt: for builds with disabled-proxy, skip all proxy setopts() [12]
- o url: Load if_nametoindex() dynamically from iphlpapi.dll on Windows [24]
- o url: fix bad feature-disable #ifdef [7]
- o url: use correct port in ConnectionExists() [22]
- o winbuild: Use two space indentation [11]
+ o progress: make the progress meter appear again [1]
 
 This release includes the following known bugs:
 
@@ -51,50 +17,11 @@ This release includes the following known bugs:
 This release would not have looked like this without help, code, reports and
 advice from friends like these:
 
-  Benbuck Nason, Carlos ORyan, Daniel Stenberg, Dave Reisner,
-  dbrowndan on github, dkwolfe4 on github, Edmond Yu, elsamuko on github,
-  Eric Wu, Frank Gevaerts, Gisle Vanem, Hubert Kario, Jonas Vautherin,
-  Josie Huddleston, Kunal Ekawde, Maksim Stsepanenka, Marcel Raad,
-  Marc Hörsken, Michael Kaufmann, Patrick Monnerat, Ray Satiro,
-  Sergey Ogryzkov, smuellerDD on github, Steve Holme, Tom Greenslade,
-  Tom van der Woerdt, wesinator on github,
-  (27 contributors)
+  Chih-Hsuan Yen, Daniel Stenberg,
+  (2 contributors)
 
         Thanks! (and sorry if I forgot to mention someone)
 
 References to bug reports and discussions on issues:
 
- [1] = https://curl.haxx.se/bug/?i=3482
- [2] = https://curl.haxx.se/bug/?i=3917
- [3] = https://curl.haxx.se/bug/?i=3888
- [4] = https://curl.haxx.se/bug/?i=3919
- [5] = https://curl.haxx.se/bug/?i=3290
- [6] = https://curl.haxx.se/bug/?i=3927
- [7] = https://curl.haxx.se/bug/?i=3924
- [8] = https://curl.haxx.se/bug/?i=3923
- [9] = https://curl.haxx.se/bug/?i=3921
- [10] = https://curl.haxx.se/bug/?i=3922
- [11] = https://curl.haxx.se/bug/?i=3930
- [12] = https://curl.haxx.se/bug/?i=3926
- [13] = https://curl.haxx.se/bug/?i=3932
- [14] = https://curl.haxx.se/bug/?i=3653
- [15] = https://curl.haxx.se/bug/?i=3952
- [16] = https://curl.haxx.se/bug/?i=3939
- [17] = https://curl.haxx.se/bug/?i=3945
- [18] = https://curl.haxx.se/bug/?i=3949
- [19] = https://curl.haxx.se/bug/?i=3948
- [20] = https://curl.haxx.se/bug/?i=3916
- [21] = https://curl.haxx.se/bug/?i=3951
- [22] = https://curl.haxx.se/bug/?i=3956
- [23] = https://curl.haxx.se/bug/?i=3959
- [24] = https://curl.haxx.se/bug/?i=3960
- [25] = https://curl.haxx.se/bug/?i=3941
- [26] = https://curl.haxx.se/bug/?i=3966
- [27] = https://curl.haxx.se/bug/?i=3962
- [28] = https://curl.haxx.se/bug/?i=3968
- [29] = https://curl.haxx.se/bug/?i=3938
- [30] = https://curl.haxx.se/bug/?i=3964
- [31] = https://curl.haxx.se/bug/?i=3970
- [32] = https://curl.haxx.se/bug/?i=3972
- [33] = https://curl.haxx.se/bug/?i=3985
- [34] = https://curl.haxx.se/mail/lib-2019-06/0009.html
+ [1] = https://curl.haxx.se/bug/?i=4122

vendor/curl/RELEASE-NOTES

@@ -927,7 +927,6 @@ typedef enum {
    but 32 */
 #define CURLOPTTYPE_LONG          0
 #define CURLOPTTYPE_OBJECTPOINT   10000
-#define CURLOPTTYPE_STRINGPOINT   10000
 #define CURLOPTTYPE_FUNCTIONPOINT 20000
 #define CURLOPTTYPE_OFF_T         30000
 
@@ -947,12 +946,15 @@ typedef enum {
 /* The macro "##" is ISO C, we assume pre-ISO C doesn't support it. */
 #define LONG          CURLOPTTYPE_LONG
 #define OBJECTPOINT   CURLOPTTYPE_OBJECTPOINT
-#define STRINGPOINT   CURLOPTTYPE_OBJECTPOINT
 #define FUNCTIONPOINT CURLOPTTYPE_FUNCTIONPOINT
 #define OFF_T         CURLOPTTYPE_OFF_T
 #define CINIT(name,type,number) CURLOPT_/**/name = type + number
 #endif
 
+/* handy aliases that make no run-time difference */
+#define CURLOPTTYPE_STRINGPOINT  CURLOPTTYPE_OBJECTPOINT
+#define CURLOPTTYPE_SLISTPOINT  CURLOPTTYPE_OBJECTPOINT
+
 /*
  * This macro-mania below setups the CURLOPT_[what] enum, to be used with
  * curl_easy_setopt(). The first argument in the CINIT() macro is the [what]
@@ -1050,7 +1052,7 @@ typedef enum {
 
   /* This points to a linked list of headers, struct curl_slist kind. This
      list is also used for RTSP (in spite of its name) */
-  CINIT(HTTPHEADER, OBJECTPOINT, 23),
+  CINIT(HTTPHEADER, SLISTPOINT, 23),
 
   /* This points to a linked list of post entries, struct curl_httppost */
   CINIT(HTTPPOST, OBJECTPOINT, 24),
@@ -1065,7 +1067,7 @@ typedef enum {
   CINIT(CRLF, LONG, 27),
 
   /* send linked-list of QUOTE commands */
-  CINIT(QUOTE, OBJECTPOINT, 28),
+  CINIT(QUOTE, SLISTPOINT, 28),
 
   /* send FILE * or void * to store headers to, if you use a callback it
      is simply passed to the callback unmodified */
@@ -1100,7 +1102,7 @@ typedef enum {
   /* 38 is not used */
 
   /* send linked-list of post-transfer QUOTE commands */
-  CINIT(POSTQUOTE, OBJECTPOINT, 39),
+  CINIT(POSTQUOTE, SLISTPOINT, 39),
 
   CINIT(OBSOLETE40, OBJECTPOINT, 40), /* OBSOLETE, do not use! */
 
@@ -1176,7 +1178,7 @@ typedef enum {
   CINIT(FILETIME, LONG, 69),
 
   /* This points to a linked list of telnet options */
-  CINIT(TELNETOPTIONS, OBJECTPOINT, 70),
+  CINIT(TELNETOPTIONS, SLISTPOINT, 70),
 
   /* Max amount of cached alive connections */
   CINIT(MAXCONNECTS, LONG, 71),
@@ -1260,7 +1262,7 @@ typedef enum {
   CINIT(DNS_CACHE_TIMEOUT, LONG, 92),
 
   /* send linked-list of pre-transfer QUOTE commands */
-  CINIT(PREQUOTE, OBJECTPOINT, 93),
+  CINIT(PREQUOTE, SLISTPOINT, 93),
 
   /* set the debug function */
   CINIT(DEBUGFUNCTION, FUNCTIONPOINT, 94),
@@ -1300,7 +1302,7 @@ typedef enum {
   CINIT(PRIVATE, OBJECTPOINT, 103),
 
   /* Set aliases for HTTP 200 in the HTTP Response header */
-  CINIT(HTTP200ALIASES, OBJECTPOINT, 104),
+  CINIT(HTTP200ALIASES, SLISTPOINT, 104),
 
   /* Continue to send authentication (user+password) when following locations,
      even when hostname changed. This can potentially send off the name
@@ -1572,8 +1574,7 @@ typedef enum {
 
   /* set the bitmask for the protocols that libcurl is allowed to follow to,
      as a subset of the CURLOPT_PROTOCOLS ones. That means the protocol needs
-     to be set in both bitmasks to be allowed to get redirected to. Defaults
-     to all protocols except FILE and SCP. */
+     to be set in both bitmasks to be allowed to get redirected to. */
   CINIT(REDIR_PROTOCOLS, LONG, 182),
 
   /* set the SSH knownhost file name to use */
@@ -1590,7 +1591,7 @@ typedef enum {
   CINIT(MAIL_FROM, STRINGPOINT, 186),
 
   /* set the list of SMTP mail receiver(s) */
-  CINIT(MAIL_RCPT, OBJECTPOINT, 187),
+  CINIT(MAIL_RCPT, SLISTPOINT, 187),
 
   /* FTP: send PRET before PASV */
   CINIT(FTP_USE_PRET, LONG, 188),
@@ -1640,7 +1641,7 @@ typedef enum {
   CINIT(FNMATCH_DATA, OBJECTPOINT, 202),
 
   /* send linked-list of name:port:address sets */
-  CINIT(RESOLVE, OBJECTPOINT, 203),
+  CINIT(RESOLVE, SLISTPOINT, 203),
 
   /* Set a username for authenticated TLS */
   CINIT(TLSAUTH_USERNAME, STRINGPOINT, 204),
@@ -1730,7 +1731,7 @@ typedef enum {
 
   /* This points to a linked list of headers used for proxy requests only,
      struct curl_slist kind */
-  CINIT(PROXYHEADER, OBJECTPOINT, 228),
+  CINIT(PROXYHEADER, SLISTPOINT, 228),
 
   /* Pass in a bitmask of "header options" */
   CINIT(HEADEROPT, LONG, 229),
@@ -1777,7 +1778,7 @@ typedef enum {
 
   /* Linked-list of host:port:connect-to-host:connect-to-port,
      overrides the URL's host:port (only for the network layer) */
-  CINIT(CONNECT_TO, OBJECTPOINT, 243),
+  CINIT(CONNECT_TO, SLISTPOINT, 243),
 
   /* Set TCP Fast Open */
   CINIT(TCP_FASTOPEN, LONG, 244),

vendor/curl/include/curl/curl.h

@@ -30,13 +30,13 @@
 
 /* This is the version number of the libcurl package from which this header
    file origins: */
-#define LIBCURL_VERSION "7.65.1"
+#define LIBCURL_VERSION "7.65.3"
 
 /* The numeric version number is also available "in parts" by using these
    defines: */
 #define LIBCURL_VERSION_MAJOR 7
 #define LIBCURL_VERSION_MINOR 65
-#define LIBCURL_VERSION_PATCH 1
+#define LIBCURL_VERSION_PATCH 3
 
 /* This is the numeric version of the libcurl version number, meant for easier
    parsing and comparions by programs. The LIBCURL_VERSION_NUM define will
@@ -57,7 +57,7 @@
    CURL_VERSION_BITS() macro since curl's own configure script greps for it
    and needs it to contain the full number.
 */
-#define LIBCURL_VERSION_NUM 0x074101
+#define LIBCURL_VERSION_NUM 0x074103
 
 /*
  * This is the date and time when the full source package was created. The
@@ -68,7 +68,7 @@
  *
  * "2007-11-23"
  */
-#define LIBCURL_TIMESTAMP "2019-06-05"
+#define LIBCURL_TIMESTAMP "2019-07-19"
 
 #define CURL_VERSION_BITS(x,y,z) ((x)<<16|(y)<<8|(z))
 #define CURL_AT_LEAST_VERSION(x,y,z) \

vendor/curl/include/curl/curlver.h

@@ -300,12 +300,14 @@ _CURL_WARNING(_curl_easy_getinfo_err_curl_off_t,
    (option) == CURLOPT_PROXY_SSLKEY ||                                        \
    (option) == CURLOPT_PROXY_SSLKEYTYPE ||                                    \
    (option) == CURLOPT_PROXY_SSL_CIPHER_LIST ||                               \
+   (option) == CURLOPT_PROXY_TLS13_CIPHERS ||                                 \
    (option) == CURLOPT_PROXY_TLSAUTH_PASSWORD ||                              \
-   (option) == CURLOPT_PROXY_TLSAUTH_USERNAME ||                              \
    (option) == CURLOPT_PROXY_TLSAUTH_TYPE ||                                  \
+   (option) == CURLOPT_PROXY_TLSAUTH_USERNAME ||                              \
    (option) == CURLOPT_RANDOM_FILE ||                                         \
    (option) == CURLOPT_RANGE ||                                               \
    (option) == CURLOPT_REFERER ||                                             \
+   (option) == CURLOPT_REQUEST_TARGET ||                                      \
    (option) == CURLOPT_RTSP_SESSION_ID ||                                     \
    (option) == CURLOPT_RTSP_STREAM_URI ||                                     \
    (option) == CURLOPT_RTSP_TRANSPORT ||                                      \
@@ -321,6 +323,7 @@ _CURL_WARNING(_curl_easy_getinfo_err_curl_off_t,
    (option) == CURLOPT_SSLKEY ||                                              \
    (option) == CURLOPT_SSLKEYTYPE ||                                          \
    (option) == CURLOPT_SSL_CIPHER_LIST ||                                     \
+   (option) == CURLOPT_TLS13_CIPHERS ||                                       \
    (option) == CURLOPT_TLSAUTH_PASSWORD ||                                    \
    (option) == CURLOPT_TLSAUTH_TYPE ||                                        \
    (option) == CURLOPT_TLSAUTH_USERNAME ||                                    \
@@ -362,7 +365,7 @@ _CURL_WARNING(_curl_easy_getinfo_err_curl_off_t,
    (option) == CURLOPT_SSL_CTX_DATA ||                                        \
    (option) == CURLOPT_WRITEDATA ||                                           \
    (option) == CURLOPT_RESOLVER_START_DATA ||                                 \
-   (option) == CURLOPT_CURLU ||                                               \
+   (option) == CURLOPT_TRAILERDATA ||                                         \
    0)
 
 /* evaluates to true if option takes a POST data argument (void* or char*) */
@@ -382,6 +385,7 @@ _CURL_WARNING(_curl_easy_getinfo_err_curl_off_t,
    (option) == CURLOPT_QUOTE ||                                               \
    (option) == CURLOPT_RESOLVE ||                                             \
    (option) == CURLOPT_TELNETOPTIONS ||                                       \
+   (option) == CURLOPT_CONNECT_TO ||                                          \
    0)
 
 /* groups of curl_easy_getinfo infos that take the same type of argument */

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

@@ -734,7 +734,11 @@ CURLcode Curl_set_dns_servers(struct Curl_easy *data,
     return CURLE_OK;
 
 #if (ARES_VERSION >= 0x010704)
+#if (ARES_VERSION >= 0x010b00)
+  ares_result = ares_set_servers_ports_csv(data->state.resolver, servers);
+#else
   ares_result = ares_set_servers_csv(data->state.resolver, servers);
+#endif
   switch(ares_result) {
   case ARES_SUCCESS:
     result = CURLE_OK;