CONTRIB-2513 Update contrib/libs/curl to 7.76.1

ref:6ca4bf15fd9dd0eb27cbc38bcd575b8251b98a4b

contrib/libs/curl/.yandex_meta/devtools.copyrights.report

@@ -90,7 +90,6 @@ BELONGS ya.make
         Match type      : COPYRIGHT
     Files with this license:
         lib/dynbuf.c [8:8]
-        lib/dynbuf.h [10:10]
         lib/hsts.h [10:10]
         lib/rename.c [8:8]
         lib/rename.h [10:10]
@@ -105,6 +104,8 @@ BELONGS ya.make
         Match type      : COPYRIGHT
     Files with this license:
         include/curl/curl.h [10:10]
+        include/curl/curlver.h [10:10]
+        include/curl/typecheck-gcc.h [10:10]
         lib/asyn-ares.c [8:8]
         lib/asyn-thread.c [8:8]
         lib/asyn.h [10:10]
@@ -114,14 +115,23 @@ BELONGS ya.make
         lib/connect.h [10:10]
         lib/content_encoding.c [8:8]
         lib/content_encoding.h [10:10]
+        lib/cookie.c [8:8]
         lib/cookie.h [10:10]
         lib/curl_addrinfo.c [8:8]
+        lib/curl_endian.c [8:8]
+        lib/curl_endian.h [10:10]
         lib/curl_krb5.h [10:10]
+        lib/curl_multibyte.c [8:8]
+        lib/curl_multibyte.h [10:10]
+        lib/curl_ntlm_core.c [8:8]
+        lib/curl_ntlm_core.h [10:10]
         lib/curl_ntlm_wb.c [8:8]
         lib/curl_ntlm_wb.h [10:10]
         lib/curl_path.c [8:8]
         lib/curl_range.c [8:8]
         lib/curl_range.h [10:10]
+        lib/curl_setup.h [10:10]
+        lib/curl_setup_once.h [10:10]
         lib/dict.c [8:8]
         lib/easy.c [8:8]
         lib/file.c [8:8]
@@ -129,6 +139,7 @@ BELONGS ya.make
         lib/ftp.c [8:8]
         lib/ftp.h [10:10]
         lib/ftplistparser.c [8:8]
+        lib/getinfo.c [8:8]
         lib/gopher.c [8:8]
         lib/hostasyn.c [8:8]
         lib/hostip.c [8:8]
@@ -153,11 +164,15 @@ BELONGS ya.make
         lib/http_proxy.h [10:10]
         lib/imap.c [8:8]
         lib/ldap.c [8:8]
+        lib/md4.c [8:8]
+        lib/md5.c [8:8]
+        lib/memdebug.c [8:8]
         lib/mime.c [8:8]
         lib/mime.h [10:10]
         lib/multi.c [8:8]
         lib/multihandle.h [10:10]
         lib/multiif.h [10:10]
+        lib/nonblock.c [8:8]
         lib/pingpong.c [8:8]
         lib/pingpong.h [10:10]
         lib/pop3.c [8:8]
@@ -183,6 +198,8 @@ BELONGS ya.make
         lib/url.c [8:8]
         lib/url.h [10:10]
         lib/urldata.h [10:10]
+        lib/vauth/ntlm.c [8:8]
+        lib/version.c [8:8]
         lib/vquic/ngtcp2.c [8:8]
         lib/vquic/quiche.c [8:8]
         lib/vssh/libssh2.c [8:8]
@@ -224,6 +241,19 @@ BELONGS ya.make
     Files with this license:
         COPYING [3:4]
 
+KEEP     COPYRIGHT_SERVICE_LABEL 2963ab20f331f08f092c8490148587b0
+BELONGS ya.make
+    License text:
+         * Copyright (C) 2020 - 2021, Jacob Hoffman-Andrews,
+         * <github@hoffman-andrews.com>
+    Scancode info:
+        Original SPDX id: COPYRIGHT_SERVICE_LABEL
+        Score           : 100.00
+        Match type      : COPYRIGHT
+    Files with this license:
+        lib/vtls/rustls.c [8:9]
+        lib/vtls/rustls.h [8:9]
+
 KEEP     COPYRIGHT_SERVICE_LABEL 2a3c88ee2029a89e6dd5688e436297d4
 BELONGS ya.make
     Note: matched license text is too long. Read it in the source files.
@@ -361,7 +391,6 @@ BELONGS ya.make
     Files with this license:
         lib/vauth/krb5_sspi.c [8:8]
         lib/vauth/vauth.c [8:8]
-        lib/vauth/vauth.h [10:10]
 
 KEEP     COPYRIGHT_SERVICE_LABEL 487047a176f57677c51faf4394df4c7d
 BELONGS ya.make
@@ -436,8 +465,6 @@ BELONGS ya.make
         include/curl/options.h [10:10]
         include/curl/urlapi.h [10:10]
         lib/curl_sha256.h [10:11]
-        lib/sha256.c [8:9]
-        lib/smb.h [10:11]
 
 KEEP     COPYRIGHT_SERVICE_LABEL 520dfafb050652350468b32c3d62b5cd
 BELONGS ya.make
@@ -485,6 +512,17 @@ BELONGS ya.make
         lib/pop3.h [10:10]
         lib/smtp.h [10:10]
 
+KEEP     COPYRIGHT_SERVICE_LABEL 6feef5fca9290bd2166cd3c8cc470230
+BELONGS ya.make
+    License text:
+         * Copyright (C) 2020 - 2021, Simon Josefsson, <simon@josefsson.org>, et al.
+    Scancode info:
+        Original SPDX id: COPYRIGHT_SERVICE_LABEL
+        Score           : 100.00
+        Match type      : COPYRIGHT
+    Files with this license:
+        lib/vauth/gsasl.c [8:8]
+
 KEEP     COPYRIGHT_SERVICE_LABEL 76a14b8bb4e715fa4b3e1efe01097c43
 BELONGS ya.make
     License text:
@@ -532,7 +570,6 @@ BELONGS ya.make
         lib/altsvc.c [8:8]
         lib/altsvc.h [10:10]
         lib/socketpair.c [8:8]
-        lib/socketpair.h [10:10]
 
 KEEP     COPYRIGHT_SERVICE_LABEL 84500f86b97af8062c8463ad37fdf711
 BELONGS ya.make
@@ -554,24 +591,19 @@ BELONGS ya.make
         Score           : 100.00
         Match type      : COPYRIGHT
     Files with this license:
-        include/curl/curlver.h [10:10]
         include/curl/easy.h [10:10]
         include/curl/mprintf.h [10:10]
         include/curl/multi.h [10:10]
         include/curl/stdcheaders.h [10:10]
         include/curl/system.h [10:10]
-        include/curl/typecheck-gcc.h [10:10]
         lib/amigaos.c [8:8]
         lib/amigaos.h [10:10]
         lib/arpa_telnet.h [10:10]
         lib/base64.c [8:8]
-        lib/cookie.c [8:8]
         lib/curl_addrinfo.h [10:10]
         lib/curl_base64.h [10:10]
         lib/curl_ctype.c [8:8]
         lib/curl_ctype.h [10:10]
-        lib/curl_endian.c [8:8]
-        lib/curl_endian.h [10:10]
         lib/curl_fnmatch.c [8:8]
         lib/curl_fnmatch.h [10:10]
         lib/curl_get_line.c [8:8]
@@ -585,13 +617,7 @@ BELONGS ya.make
         lib/curl_memory.h [10:10]
         lib/curl_memrchr.c [8:8]
         lib/curl_memrchr.h [10:10]
-        lib/curl_multibyte.c [8:8]
-        lib/curl_multibyte.h [10:10]
-        lib/curl_ntlm_core.c [8:8]
-        lib/curl_ntlm_core.h [10:10]
         lib/curl_printf.h [10:10]
-        lib/curl_setup.h [10:10]
-        lib/curl_setup_once.h [10:10]
         lib/curl_sspi.c [8:8]
         lib/curl_sspi.h [10:10]
         lib/curl_threads.c [8:8]
@@ -608,7 +634,6 @@ BELONGS ya.make
         lib/formdata.c [8:8]
         lib/ftplistparser.h [10:10]
         lib/getenv.c [8:8]
-        lib/getinfo.c [8:8]
         lib/getinfo.h [10:10]
         lib/gopher.h [10:10]
         lib/hash.c [8:8]
@@ -624,15 +649,11 @@ BELONGS ya.make
         lib/inet_pton.h [10:10]
         lib/llist.c [8:8]
         lib/llist.h [10:10]
-        lib/md4.c [8:8]
-        lib/md5.c [8:8]
-        lib/memdebug.c [8:8]
         lib/memdebug.h [11:11]
         lib/netrc.c [8:8]
         lib/netrc.h [10:10]
         lib/non-ascii.c [8:8]
         lib/non-ascii.h [10:10]
-        lib/nonblock.c [8:8]
         lib/nonblock.h [10:10]
         lib/parsedate.c [8:8]
         lib/parsedate.h [10:10]
@@ -667,13 +688,11 @@ BELONGS ya.make
         lib/vauth/cram.c [8:8]
         lib/vauth/digest.c [8:8]
         lib/vauth/digest.h [10:10]
-        lib/vauth/ntlm.c [8:8]
         lib/vauth/ntlm.h [10:10]
         lib/vauth/ntlm_sspi.c [8:8]
         lib/vauth/oauth2.c [8:8]
         lib/vauth/spnego_gssapi.c [8:8]
         lib/vauth/spnego_sspi.c [8:8]
-        lib/version.c [8:8]
         lib/vquic/vquic.c [8:8]
         lib/vtls/gskit.h [10:10]
         lib/vtls/gtls.h [10:10]
@@ -706,6 +725,7 @@ BELONGS ya.make
         Score           : 100.00
         Match type      : COPYRIGHT
     Files with this license:
+        lib/socketpair.h [10:10]
         lib/vssh/wolfssh.c [8:8]
 
 KEEP     COPYRIGHT_SERVICE_LABEL 90ce0ec9551a9d561300240060256dff
@@ -781,6 +801,17 @@ BELONGS ya.make
         lib/version_win32.c [8:8]
         lib/version_win32.h [10:10]
 
+KEEP     COPYRIGHT_SERVICE_LABEL a708a3265e6d737aa48aa8db4c364178
+BELONGS ya.make
+    License text:
+         * Copyright (C) 2014 - 2021, Steve Holme, <steve_holme@hotmail.com>.
+    Scancode info:
+        Original SPDX id: COPYRIGHT_SERVICE_LABEL
+        Score           : 100.00
+        Match type      : COPYRIGHT
+    Files with this license:
+        lib/vauth/vauth.h [10:10]
+
 KEEP     COPYRIGHT_SERVICE_LABEL aa5c639ebb1d16024e37af0e0fff3962
 BELONGS ya.make
     License text:
@@ -947,6 +978,17 @@ BELONGS ya.make
     Files with this license:
         lib/vtls/schannel.h [10:11]
 
+KEEP     COPYRIGHT_SERVICE_LABEL f2084860a7ea915868d1e25feb89d837
+BELONGS ya.make
+    License text:
+         * Copyright (C) 2020, 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
+    Scancode info:
+        Original SPDX id: COPYRIGHT_SERVICE_LABEL
+        Score           : 100.00
+        Match type      : COPYRIGHT
+    Files with this license:
+        lib/dynbuf.h [10:10]
+
 KEEP     COPYRIGHT_SERVICE_LABEL f38404a02e69976b94505df0c691bed0
 BELONGS ya.make
     Note: matched license text is too long. Read it in the source files.
@@ -955,8 +997,8 @@ BELONGS ya.make
         Score           : 100.00
         Match type      : COPYRIGHT
     Files with this license:
-        lib/md4.c [240:245]
-        lib/md5.c [231:236]
+        lib/md4.c [213:218]
+        lib/md5.c [204:209]
 
 KEEP     COPYRIGHT_SERVICE_LABEL f57f87b3877adb749c37808e1cc2057b
 BELONGS ya.make
@@ -969,3 +1011,5 @@ BELONGS ya.make
     Files with this license:
         lib/doh.c [8:8]
         lib/doh.h [10:10]
+        lib/sha256.c [8:9]
+        lib/smb.h [10:11]

contrib/libs/curl/.yandex_meta/licenses.list.txt

@@ -158,6 +158,10 @@
  * Copyright (C) 2014 - 2020, Steve Holme, <steve_holme@hotmail.com>.
 
 
+====================COPYRIGHT====================
+ * Copyright (C) 2014 - 2021, Steve Holme, <steve_holme@hotmail.com>.
+
+
 ====================COPYRIGHT====================
  * Copyright (C) 2015 - 2020, Steve Holme, <steve_holme@hotmail.com>.
 
@@ -227,6 +231,19 @@
  * Copyright (C) 2019, Björn Stenberg, <bjorn@haxx.se>
 
 
+====================COPYRIGHT====================
+ * Copyright (C) 2020 - 2021, Jacob Hoffman-Andrews,
+ * <github@hoffman-andrews.com>
+
+
+====================COPYRIGHT====================
+ * Copyright (C) 2020 - 2021, Simon Josefsson, <simon@josefsson.org>, et al.
+
+
+====================COPYRIGHT====================
+ * Copyright (C) 2020, 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
+
+
 ====================COPYRIGHT====================
  * Copyright (C) 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
 

contrib/libs/curl/CMakeLists.txt

@@ -153,6 +153,7 @@ target_sources(contrib-libs-curl PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/libs/curl/lib/vauth/cram.c
   ${CMAKE_SOURCE_DIR}/contrib/libs/curl/lib/vauth/digest.c
   ${CMAKE_SOURCE_DIR}/contrib/libs/curl/lib/vauth/digest_sspi.c
+  ${CMAKE_SOURCE_DIR}/contrib/libs/curl/lib/vauth/gsasl.c
   ${CMAKE_SOURCE_DIR}/contrib/libs/curl/lib/vauth/krb5_gssapi.c
   ${CMAKE_SOURCE_DIR}/contrib/libs/curl/lib/vauth/krb5_sspi.c
   ${CMAKE_SOURCE_DIR}/contrib/libs/curl/lib/vauth/ntlm.c
@@ -173,6 +174,7 @@ target_sources(contrib-libs-curl PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/libs/curl/lib/vtls/keylog.c
   ${CMAKE_SOURCE_DIR}/contrib/libs/curl/lib/vtls/mbedtls_threadlock.c
   ${CMAKE_SOURCE_DIR}/contrib/libs/curl/lib/vtls/openssl.c
+  ${CMAKE_SOURCE_DIR}/contrib/libs/curl/lib/vtls/rustls.c
   ${CMAKE_SOURCE_DIR}/contrib/libs/curl/lib/vtls/sectransp.c
   ${CMAKE_SOURCE_DIR}/contrib/libs/curl/lib/vtls/vtls.c
   ${CMAKE_SOURCE_DIR}/contrib/libs/curl/lib/vtls/wolfssl.c

contrib/libs/curl/RELEASE-NOTES

@@ -1,135 +1,38 @@
-curl and libcurl 7.75.0
+curl and libcurl 7.76.1
 
- Public curl releases:         197
- Command line options:         237
- curl_easy_setopt() options:   285
+ Public curl releases:         199
+ Command line options:         240
+ curl_easy_setopt() options:   288
  Public functions in libcurl:  85
- Contributors:                 2322
+ Contributors:                 2366
 
 This release includes the following changes:
 
- o curl: add --create-file-mode [mode] [28]
- o curl: add new variables to --write-out [25]
- o dns: extend CURLOPT_RESOLVE syntax for adding non-permanent entries [53]
- o gopher: implement secure gopher protocol [2]
- o http: add Hyper as new optional HTTP backend [24]
- o http: introduce AWS HTTP v4 Signature support [26]
+ o
 
 This release includes the following bugfixes:
 
- o badsymbols.pl: add verbose mode -v [31]
- o badsymbols.pl: ignore stand-alone single hash lines [40]
- o BUG-BOUNTY: minor language updates [5]
- o build: fix djgpp builds [84]
- o cleanup: fix empty expression statement has no effect
- o cmake: Add an option to disable libidn2 [48]
- o cmake: enable gophers correctly in curl-config [10]
- o cmake: expose CURL_DISABLE_OPENSSL_AUTO_LOAD_CONFIG [32]
- o cmdline-opts/gen.pl: return hard on errors [11]
- o cmdline-opts/retry.d: mention response code 429 as well [47]
- o configure: set -Wextra-semi-stmt for clang with --enable-debug [52]
- o connect: defer port selection until connect() time [22]
- o connect: mark intentional ignores of setsockopt return values [75]
- o connect: on linux, enable reporting of all ICMP errors on UDP sockets [27]
- o connect: zero variable on stack to silence valgrind complaint [23]
- o cookie: avoid the C1001 internal compiler error with MSVC 14 [36]
- o curl.1: fix typo microsft -> microsoft [56]
- o curl: fix handling of -q option [39]
- o curl: include the file name in --xattr/--remote-time error msgs
- o curl: move fprintf outputs to warnf [105]
- o Curl_chunker: shrink the struct [104]
- o curl_easy_pause.3: add multiplexed pause effects [41]
- o CURLINFO_PRETRANSFER_TIME.3: clarify [61]
- o CURLOPT_URL.3: remove scheme specific details [12]
- o digest_sspi: Show InitializeSecurityContext errors in verbose mode [8]
- o docs/examples: adjust prototypes for CURLOPT_READFUNCTION [51]
- o docs/URL-SYNTAX: the URL syntax curl accepts and works with [15]
- o docs: enable syntax highlighting in several docs files [16]
- o docs: fix line length bug in gen.pl [70]
- o docs: fix typos in NEW-PROTOCOL.md [102]
- o docs: fix wrong documentation in help.d [71]
- o docs: remove redundant "better" in --fail help [55]
- o doh: allocate state struct on demand [85]
- o examples/libtest: add .checksrc to dist [14]
- o examples: remove superfluous asterisk uses
- o failf: remove newline from formatting strings [35]
- o file: don't provide content-length for directories [49]
- o getinfo: build with disabled HTTP support
- o gitattributes: Set batch files to CRLF line endings on checkout [65]
- o h2: do not wait for RECV on paused transfers [43]
- o HISTORY: added dates to early history
- o http: empty reply connection are not left intact [80]
- o http: get CURLOPT_REQUEST_TARGET working with a HTTP proxy [83]
- o http: have CURLOPT_FAILONERROR fail after all headers [54]
- o http: make providing Proxy-Connection header not cause duplicated headers [92]
- o http: show the request as headers even when split-sending [7]
- o http_chunks: correct and clarify a comment on hexnumber length [88]
- o http_proxy: Fix CONNECT chunked encoding race condition [76]
- o httpauth: make multi-request auth work with custom port [45]
- o INSTALL: now at 85 operating systems
- o INSTALL: update the list known OSes and CPU archs curl has run on [38]
- o lib/unit tests: add missing curl_global_cleanup() calls
- o lib1564/5: verify that curl_multi_wakeup returns OK
- o lib: pass in 'struct Curl_easy *' to most functions [101]
- o lib: remove Curl_ prefix from many static functions [66]
- o lib: save a bit of space with some structure packing [82]
- o libssh2: fix "Value stored to 'readdir_len' is never read"
- o libssh2: move data from connection object to transfer object [114]
- o libssh: avoid plain free() of libssh-memory [99]
- o mime: make sure setting MIMEPOST to NULL resets properly [58]
- o misc: assorted typo fixes [57]
- o misc: fix "warning: empty expression statement has no effect" [30]
- o misc: fix typos [73]
- o mk-ca-bundle.pl: deterministic output when using -t [62]
- o mqtt: deal with 0 byte reads correctly [4]
- o mqtt: handle POST/PUBLISH without a set POSTFIELDSIZE [1]
- o multi: set the PRETRANSFER time-stamp when we switch to PERFORM [59]
- o multi: skip DONE state if there's no connection left for ftp wildcard
- o multi: when erroring in TOOFAST state, act as for PERFORM [9]
- o multi_runsingle: bail out early on data->conn == NULL [74]
- o ngtcp2: Fix http3 upload stall [106]
- o ngtcp2: Fix stack buffer overflow [107]
- o ngtcp2: make it build it current master again [21]
- o nss: get the run-time version instead of build-time [67]
- o openssl: lowercase the hostname before using it for SNI [46]
- o OS400: update ccsidcurl.c [20]
- o pretransfer: setup the User-Agent header here [60]
- o quiche: remove fprintf() leftover
- o Revert "CI/github: work-around for brew breakage on macOS" [17]
- o runtests: add 'wakeup' as a feature
- o runtests: add support for %if [feature] conditions [19]
- o runtests: preprocess DISABLED to allow conditionals [93]
- o schannel: plug a memory-leak [64]
- o schannel_verify: fix safefree call typo [50]
- o select: convert Curl_select() to private static function [103]
- o socks: use the download buffer instead [86]
- o speedcheck: exclude paused transfers [42]
- o strerror: skip errnum >= 0 assertion on windows [78]
- o test1522: add debug tracing [3]
- o test1633: set appropriate name
- o test179: use consistent header line endings
- o test410: verify HTTPS GET with a 49K request header
- o tests/mqttd: extract the client id from the correct offset [13]
- o tests: make --libcurl tests only test FTP options if ftp enabled [18]
- o tool_doswin: Restore original console settings on CTRL signal [68]
- o tool_operate: fix the suppression logic of some error messages [33]
- o tool_operate: spellfix a comment
- o tooĺ_writeout: fix the -w time output units [6]
- o transfer: fix GCC 10 warning with flag '-Wint-in-bool-context' [79]
- o travis: build ngtcp2 --with-gnutls [72]
- o travis: limit the tests with quiche builds to HTTPS and FTPS only [44]
- o travis: restrict the openssl3 job to only run https and ftps tests [34]
- o url: if IDNA conversion fails, fallback to Transitional [29]
- o urldata: make magic be the first struct field [87]
- o urldata: remove 'local_ip' from the connectdata struct [97]
- o urldata: remove duplicate 'upkeep_interval_ms' from connectdata [96]
- o urldata: remove duplicate port number storage [98]
- o urldata: remove the duplicate 'ip_addr_str' field [100]
- o urldata: store ip version in a single byte [95]
- o vtls: remove md5sum [69]
- o warnless: remove curlx_ultosi [108]
- o wolfssl: add SECURE_RENEGOTIATION support [63]
- o wolfssl: Support wolfSSL builds missing TLS 1.1 [37]
+ o configure: disable min version set for Darwin [19]
+ o configure: include <time.h> unconditionally [16]
+ o configure: remove use of RETSIGTYPE [17]
+ o docs/HTTP3.md: update the build instruction using gnutls [20]
+ o examples/hiperfifo.c: check event_initialized before delete [11]
+ o file: support GETing directories again [10]
+ o github/workflow: add "security-extended" to codeql-analysis.yml [14]
+ o h2: allow 100 streams by default [9]
+ o hostip: fix builds that disable all asynchronous DNS [1]
+ o http_proxy: only loop on 407 + close if we have credentials [8]
+ o install: add instructions for Apple Darwin platforms [18]
+ o lib: remove unused HAVE_INET_NTOA_R* defines [15]
+ o libssh: get rid of PATH_MAX [7]
+ o ngtcp2+gnutls: clear credentials when freed [5]
+ o ngtcp2: Use ALPN h3-29 for now [21]
+ o ntlm: fix negotiated flags usage [12]
+ o ntlm: support version 2 on 32-bit platforms [13]
+ o openssl: fix CURLOPT_SSLCERT_BLOB without CURLOPT_SSLCERT_KEY [2]
+ o TLS: fix HTTP/2 selection [3]
+ o tool_progress: fix progress meter final update in parallel mode [6]
+ o typecheck-gcc: make the ssl-ctx-cb check use SSL_CTX pointers [4]
 
 This release includes the following known bugs:
 
@@ -138,125 +41,34 @@ 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:
 
-  0xflotus on github, Alessandro Ghedini, Andrey Gursky, Bubu on github,
-  Cherish98 on github, Christoph M. Becker, Cory Benfield, Cristian Rodríguez,
-  Dan Fandrich, Daniel Stenberg, David Earl, Denis Laxalde, Dennis Clarke,
-  Dmitry Wagin, Douglas R. Reno, Earnestly on github, Emil Engler, Erik Olsson,
-  Fabian Keil, Flameborn on github, Ganesh Kamath, Gergely Nagy, Gisle Vanem,
-  Hans-Christian Noren Egtvedt, Harry Sintonen, Himanshu Gupta, Hongyi Zhao,
-  Ian Spence, Ikko Ashimine, Jacob Hoffman-Andrews, Jeremy Thibault,
-  Jon Rumsey, Jon Wilkes, Julian Montes, Kevin Ushey, Marcel Raad,
-  Matthias Gatto, Matt Holt, Michał Antoniak, Mike Gelfand, Mike Tzou,
-  Nick Zitzmann, Olaf Hering, parazyd on github, Patrick Monnerat, Paul Groke,
-  Ray Satiro, Razvan Cojocaru, Rich Turner, Sai Ram Kunala, Sean McArthur,
-  Tatsuhiro Tsujikawa, Tomas Berger, UrsusArctos on github, Viktor Szakats,
-  William A. Rowe Jr, XhmikosR on github, 不确定
-  (58 contributors)
-
-        Thanks! (and sorry if I forgot to mention someone)
+  Anthony Shaw, Benbuck Nason, Cesar Eduardo Barros, Cherish98 on github,
+  Christian Schmitz, Daniel Kurečka, Daniel Stenberg, David Hu, Emil Engler,
+  Gilles Vollant, Jochem Broekhoff, Jürgen Gmach, Kenneth Davidson,
+  locpyl-tidnyd on github, Luke Granger-Brown, Marcel Raad, Michael Forney,
+  Muhammed Yavuz Nuzumlalı, Patrick Monnerat, Ray Satiro, romamik om github,
+  Tatsuhiro Tsujikawa, Viktor Szakats,
+  (23 contributors)
 
 References to bug reports and discussions on issues:
 
- [1] = https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=28735
- [2] = https://curl.se/bug/?i=6208
- [3] = https://curl.se/bug/?i=6331
- [4] = https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=28676
- [5] = https://curl.se/bug/?i=6318
- [6] = https://curl.se/bug/?i=6321
- [7] = https://curl.se/bug/?i=6328
- [8] = https://curl.se/bug/?i=6315
- [9] = https://curl.se/bug/?i=6333
- [10] = https://curl.se/bug/?i=6336
- [11] = https://curl.se/bug/?i=6354
- [12] = https://curl.se/bug/?i=6307
- [13] = https://curl.se/bug/?i=6334
- [14] = https://curl.se/bug/?i=6176
- [15] = https://curl.se/bug/?i=6285
- [16] = https://curl.se/bug/?i=6286
- [17] = https://curl.se/bug/?i=6332
- [18] = https://curl.se/bug/?i=6303
- [19] = https://curl.se/bug/?i=6304
- [20] = https://curl.se/bug/?i=6292
- [21] = https://curl.se/bug/?i=6296
- [22] = https://curl.se/bug/?i=6295
- [23] = https://curl.se/bug/?i=6289
- [24] = https://curl.se/bug/?i=6110
- [25] = https://curl.se/bug/?i=6199
- [26] = https://curl.se/bug/?i=5703
- [27] = https://curl.se/bug/?i=6341
- [28] = https://curl.se/bug/?i=6244
- [29] = https://curl.se/bug/?i=6423
- [30] = https://github.com/curl/curl/commit/08e8455dddc5e48e58a12ade3815c01ae3da3b64#commitcomment-45433279
- [31] = https://curl.se/bug/?i=6349
- [32] = https://curl.se/bug/?i=6435
- [33] = https://curl.se/mail/archive-2020-12/0017.html
- [34] = https://curl.se/bug/?i=6345
- [35] = https://curl.se/bug/?i=6365
- [36] = https://curl.se/bug/?i=6112
- [37] = https://curl.se/mail/lib-2020-12/0121.html
- [38] = https://curl.se/bug/?i=6366
- [39] = https://curl.se/bug/?i=6364
- [40] = https://curl.se/mail/lib-2020-12/0084.html
- [41] = https://curl.se/bug/?i=6360
- [42] = https://curl.se/bug/?i=6358
- [43] = https://curl.se/bug/?i=6356
- [44] = https://curl.se/bug/?i=6403
- [45] = https://curl.se/bug/?i=6397
- [46] = https://curl.se/bug/?i=6540
- [47] = https://curl.se/mail/archive-2020-12/0018.html
- [48] = https://curl.se/bug/?i=6361
- [49] = https://curl.se/bug/?i=6421
- [50] = https://curl.se/bug/?i=6459
- [51] = https://curl.se/bug/?i=6392
- [52] = https://curl.se/bug/?i=6378
- [53] = https://curl.se/bug/?i=6294
- [54] = https://curl.se/bug/?i=6408
- [55] = https://curl.se/bug/?i=6385
- [56] = https://curl.se/bug/?i=6380
- [57] = https://curl.se/bug/?i=6375
- [58] = https://curl.se/bug/?i=6455
- [59] = https://curl.se/bug/?i=6454
- [60] = https://curl.se/bug/?i=6312
- [61] = https://curl.se/bug/?i=6453
- [62] = https://curl.se/bug/?i=6413
- [63] = https://curl.se/bug/?i=6411
- [64] = https://curl.se/bug/?i=6457
- [65] = https://github.com/curl/curl/discussions/6427
- [66] = https://curl.se/bug/?i=6443
- [67] = https://curl.se/bug/?i=6445
- [68] = https://curl.se/bug/?i=6226
- [69] = https://curl.se/bug/?i=6557
- [70] = https://curl.se/bug/?i=6438
- [71] = https://curl.se/bug/?i=6436
- [72] = https://curl.se/bug/?i=6493
- [73] = https://curl.se/mail/lib-2021-01/0063.html
- [74] = https://curl.se/bug/?i=6433
- [75] = https://curl.se/bug/?i=6431
- [76] = https://curl.se/mail/lib-2021-01/0033.html
- [78] = https://curl.se/bug/?i=6504
- [79] = https://curl.se/bug/?i=6537
- [80] = https://twitter.com/mholt6/status/1352130240265375744
- [82] = https://curl.se/bug/?i=6483
- [83] = https://curl.se/bug/?i=6490
- [84] = https://curl.se/bug/?i=6382
- [85] = https://curl.se/bug/?i=6492
- [86] = https://curl.se/bug/?i=6491
- [87] = https://curl.se/bug/?i=6484
- [88] = https://curl.se/bug/?i=6489
- [92] = https://curl.se/mail/lib-2021-01/0095.html
- [93] = https://curl.se/bug/?i=6477
- [95] = https://curl.se/bug/?i=6534
- [96] = https://curl.se/bug/?i=6534
- [97] = https://curl.se/bug/?i=6534
- [98] = https://curl.se/bug/?i=6534
- [99] = https://curl.se/bug/?i=6481
- [100] = https://curl.se/bug/?i=6534
- [101] = https://curl.se/bug/?i=6425
- [102] = https://curl.se/bug/?i=6471
- [103] = https://curl.se/bug/?i=6531
- [104] = https://curl.se/bug/?i=6527
- [105] = https://curl.se/bug/?i=6533
- [106] = https://curl.se/bug/?i=6521
- [107] = https://curl.se/bug/?i=6521
- [108] = https://curl.se/bug/?i=6530
- [114] = https://curl.se/bug/?i=6519
+ [1] = https://curl.se/bug/?i=6831
+ [2] = https://curl.se/bug/?i=6816
+ [3] = https://curl.se/bug/?i=6825
+ [4] = https://curl.se/bug/?i=6818
+ [5] = https://curl.se/bug/?i=6824
+ [6] = https://curl.se/bug/?i=6840
+ [7] = https://curl.se/bug/?i=6829
+ [8] = https://curl.se/bug/?i=6828
+ [9] = https://curl.se/bug/?i=6852
+ [10] = https://curl.se/bug/?i=6845
+ [11] = https://curl.se/bug/?i=6876
+ [12] = https://curl.se/bug/?i=6813
+ [13] = https://curl.se/bug/?i=6849
+ [14] = https://curl.se/bug/?i=6815
+ [15] = https://curl.se/bug/?i=6867
+ [16] = https://curl.se/bug/?i=6859
+ [17] = https://curl.se/bug/?i=6861
+ [18] = https://curl.se/bug/?i=6860
+ [19] = https://curl.se/bug/?i=6838
+ [20] = https://curl.se/bug/?i=6857
+ [21] = https://curl.se/bug/?i=6864

contrib/libs/curl/include/curl/curl.h

@@ -155,7 +155,8 @@ typedef enum {
   CURLSSLBACKEND_AXTLS = 10, /* never used since 7.63.0 */
   CURLSSLBACKEND_MBEDTLS = 11,
   CURLSSLBACKEND_MESALINK = 12,
-  CURLSSLBACKEND_BEARSSL = 13
+  CURLSSLBACKEND_BEARSSL = 13,
+  CURLSSLBACKEND_RUSTLS = 14
 } curl_sslbackend;
 
 /* aliases for library clones and renames */
@@ -2078,6 +2079,15 @@ typedef enum {
   /* Parameters for V4 signature */
   CURLOPT(CURLOPT_AWS_SIGV4, CURLOPTTYPE_STRINGPOINT, 305),
 
+  /* Same as CURLOPT_SSL_VERIFYPEER but for DOH (DNS-over-HTTPS) servers. */
+  CURLOPT(CURLOPT_DOH_SSL_VERIFYPEER, CURLOPTTYPE_LONG, 306),
+
+  /* Same as CURLOPT_SSL_VERIFYHOST but for DOH (DNS-over-HTTPS) servers. */
+  CURLOPT(CURLOPT_DOH_SSL_VERIFYHOST, CURLOPTTYPE_LONG, 307),
+
+  /* Same as CURLOPT_SSL_VERIFYSTATUS but for DOH (DNS-over-HTTPS) servers. */
+  CURLOPT(CURLOPT_DOH_SSL_VERIFYSTATUS, CURLOPTTYPE_LONG, 308),
+
   CURLOPT_LASTENTRY /* the last unused */
 } CURLoption;
 
@@ -2751,8 +2761,9 @@ typedef enum {
   CURLINFO_RETRY_AFTER      = CURLINFO_OFF_T + 57,
   CURLINFO_EFFECTIVE_METHOD = CURLINFO_STRING + 58,
   CURLINFO_PROXY_ERROR      = CURLINFO_LONG + 59,
+  CURLINFO_REFERER          = CURLINFO_STRING + 60,
 
-  CURLINFO_LASTONE          = 59
+  CURLINFO_LASTONE          = 60
 } CURLINFO;
 
 /* CURLINFO_RESPONSE_CODE is the new name for the option previously known as
@@ -2953,6 +2964,7 @@ typedef struct curl_version_info_data curl_version_info_data;
 #define CURL_VERSION_ZSTD         (1<<26) /* zstd features are present */
 #define CURL_VERSION_UNICODE      (1<<27) /* Unicode support on Windows */
 #define CURL_VERSION_HSTS         (1<<28) /* HSTS is supported */
+#define CURL_VERSION_GSASL        (1<<29) /* libgsasl is supported */
 
  /*
  * NAME curl_version_info()

contrib/libs/curl/include/curl/curlver.h

@@ -7,7 +7,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
@@ -26,17 +26,17 @@
    a script at release-time. This was made its own header file in 7.11.2 */
 
 /* This is the global package copyright */
-#define LIBCURL_COPYRIGHT "1996 - 2020 Daniel Stenberg, <daniel@haxx.se>."
+#define LIBCURL_COPYRIGHT "1996 - 2021 Daniel Stenberg, <daniel@haxx.se>."
 
 /* This is the version number of the libcurl package from which this header
    file origins: */
-#define LIBCURL_VERSION "7.75.0"
+#define LIBCURL_VERSION "7.76.1"
 
 /* The numeric version number is also available "in parts" by using these
    defines: */
 #define LIBCURL_VERSION_MAJOR 7
-#define LIBCURL_VERSION_MINOR 75
-#define LIBCURL_VERSION_PATCH 0
+#define LIBCURL_VERSION_MINOR 76
+#define LIBCURL_VERSION_PATCH 1
 
 /* This is the numeric version of the libcurl version number, meant for easier
    parsing and comparisons 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 0x074b00
+#define LIBCURL_VERSION_NUM 0x074c01
 
 /*
  * This is the date and time when the full source package was created. The
@@ -68,7 +68,7 @@
  *
  * "2007-11-23"
  */
-#define LIBCURL_TIMESTAMP "2021-02-03"
+#define LIBCURL_TIMESTAMP "2021-04-14"
 
 #define CURL_VERSION_BITS(x,y,z) ((x)<<16|(y)<<8|(z))
 #define CURL_AT_LEAST_VERSION(x,y,z) \

contrib/libs/curl/include/curl/typecheck-gcc.h

@@ -7,7 +7,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
@@ -667,11 +667,11 @@ typedef CURLcode (*_curl_ssl_ctx_callback4)(CURL *, const void *,
 /* hack: if we included OpenSSL's ssl.h, we know about SSL_CTX
  * this will of course break if we're included before OpenSSL headers...
  */
-typedef CURLcode (*_curl_ssl_ctx_callback5)(CURL *, SSL_CTX, void *);
-typedef CURLcode (*_curl_ssl_ctx_callback6)(CURL *, SSL_CTX, const void *);
-typedef CURLcode (*_curl_ssl_ctx_callback7)(CURL *, const SSL_CTX, void *);
-typedef CURLcode (*_curl_ssl_ctx_callback8)(CURL *, const SSL_CTX,
-                                           const void *);
+typedef CURLcode (*_curl_ssl_ctx_callback5)(CURL *, SSL_CTX *, void *);
+typedef CURLcode (*_curl_ssl_ctx_callback6)(CURL *, SSL_CTX *, const void *);
+typedef CURLcode (*_curl_ssl_ctx_callback7)(CURL *, const SSL_CTX *, void *);
+typedef CURLcode (*_curl_ssl_ctx_callback8)(CURL *, const SSL_CTX *,
+                                            const void *);
 #else
 typedef _curl_ssl_ctx_callback1 _curl_ssl_ctx_callback5;
 typedef _curl_ssl_ctx_callback1 _curl_ssl_ctx_callback6;

contrib/libs/curl/lib/asyn-ares.c

@@ -384,13 +384,8 @@ CURLcode Curl_resolver_is_resolved(struct Curl_easy *data,
        them */
     res->temp_ai = NULL;
 
-    if(!data->state.async.dns) {
-      failf(data, "Could not resolve: %s (%s)",
-            data->state.async.hostname,
-            ares_strerror(data->state.async.status));
-      result = data->conn->bits.proxy?CURLE_COULDNT_RESOLVE_PROXY:
-        CURLE_COULDNT_RESOLVE_HOST;
-    }
+    if(!data->state.async.dns)
+      result = Curl_resolver_error(data);
     else
       *dns = data->state.async.dns;