diff --git a/.gitignore b/.gitignore index ebd7ae45..1be394c8 100644 --- a/.gitignore +++ b/.gitignore @@ -78,32 +78,32 @@ DOjS-cppcheck-build-dir/ JSBOOT.ZIP cacert.pem 3rdparty/curl-7.80.0/lib/curl_config.h -3rdparty/openssl-1.1.1n/libcrypto.pc -3rdparty/openssl-1.1.1n/libssl.pc -3rdparty/openssl-1.1.1n/3rdparty/openssl.pc -3rdparty/openssl-1.1.1n/crypto/buildinf.h -3rdparty/openssl-1.1.1n/crypto/bf/bf-586.s -3rdparty/openssl-1.1.1n/crypto/bn/bn-586.s -3rdparty/openssl-1.1.1n/crypto/bn/co-586.s -3rdparty/openssl-1.1.1n/crypto/bn/x86-gf2m.s -3rdparty/openssl-1.1.1n/crypto/bn/x86-mont.s -3rdparty/openssl-1.1.1n/crypto/camellia/cmll-x86.s -3rdparty/openssl-1.1.1n/crypto/cast/cast-586.s -3rdparty/openssl-1.1.1n/crypto/chacha/chacha-x86.s -3rdparty/openssl-1.1.1n/crypto/des/crypt586.s -3rdparty/openssl-1.1.1n/crypto/des/des-586.s -3rdparty/openssl-1.1.1n/crypto/ec/ecp_nistz256-x86.s -3rdparty/openssl-1.1.1n/crypto/md5/md5-586.s -3rdparty/openssl-1.1.1n/crypto/modes/ghash-x86.s -3rdparty/openssl-1.1.1n/crypto/poly1305/poly1305-x86.s -3rdparty/openssl-1.1.1n/crypto/rc4/rc4-586.s -3rdparty/openssl-1.1.1n/crypto/ripemd/rmd-586.s -3rdparty/openssl-1.1.1n/crypto/sha/sha1-586.s -3rdparty/openssl-1.1.1n/crypto/sha/sha256-586.s -3rdparty/openssl-1.1.1n/crypto/sha/sha512-586.s -3rdparty/openssl-1.1.1n/include/crypto/bn_conf.h -3rdparty/openssl-1.1.1n/include/crypto/dso_conf.h -3rdparty/openssl-1.1.1n/include/openssl/opensslconf.h +3rdparty/openssl-1.1.1q/libcrypto.pc +3rdparty/openssl-1.1.1q/libssl.pc +3rdparty/openssl-1.1.1q/3rdparty/openssl.pc +3rdparty/openssl-1.1.1q/crypto/buildinf.h +3rdparty/openssl-1.1.1q/crypto/bf/bf-586.s +3rdparty/openssl-1.1.1q/crypto/bn/bn-586.s +3rdparty/openssl-1.1.1q/crypto/bn/co-586.s +3rdparty/openssl-1.1.1q/crypto/bn/x86-gf2m.s +3rdparty/openssl-1.1.1q/crypto/bn/x86-mont.s +3rdparty/openssl-1.1.1q/crypto/camellia/cmll-x86.s +3rdparty/openssl-1.1.1q/crypto/cast/cast-586.s +3rdparty/openssl-1.1.1q/crypto/chacha/chacha-x86.s +3rdparty/openssl-1.1.1q/crypto/des/crypt586.s +3rdparty/openssl-1.1.1q/crypto/des/des-586.s +3rdparty/openssl-1.1.1q/crypto/ec/ecp_nistz256-x86.s +3rdparty/openssl-1.1.1q/crypto/md5/md5-586.s +3rdparty/openssl-1.1.1q/crypto/modes/ghash-x86.s +3rdparty/openssl-1.1.1q/crypto/poly1305/poly1305-x86.s +3rdparty/openssl-1.1.1q/crypto/rc4/rc4-586.s +3rdparty/openssl-1.1.1q/crypto/ripemd/rmd-586.s +3rdparty/openssl-1.1.1q/crypto/sha/sha1-586.s +3rdparty/openssl-1.1.1q/crypto/sha/sha256-586.s +3rdparty/openssl-1.1.1q/crypto/sha/sha512-586.s +3rdparty/openssl-1.1.1q/include/crypto/bn_conf.h +3rdparty/openssl-1.1.1q/include/crypto/dso_conf.h +3rdparty/openssl-1.1.1q/include/openssl/opensslconf.h 5.BMP 5.PCX 5.PNG @@ -116,7 +116,7 @@ TMP1.TMP TMP1.ZIP TMP2.TMP TMP2.ZIP -3rdparty/openssl-1.1.1n/apps/progs.h +3rdparty/openssl-1.1.1q/apps/progs.h .picasa.ini fddojs.zip *.mpg @@ -127,3 +127,4 @@ W32DHCP.TMP dosbox.conf __experiments/ ftest.txt +3rdparty/openssl-1.1.1q/openssl.pc diff --git a/3rdparty/curl-7.80.0/CHANGES b/3rdparty/curl-7.80.0/CHANGES new file mode 100644 index 00000000..f77f0a9e --- /dev/null +++ b/3rdparty/curl-7.80.0/CHANGES @@ -0,0 +1,8300 @@ + _ _ ____ _ + ___| | | | _ \| | + / __| | | | |_) | | + | (__| |_| | _ <| |___ + \___|\___/|_| \_\_____| + + Changelog + +Version 7.80.0 (10 Nov 2021) + +Daniel Stenberg (10 Nov 2021) +- RELEASE-NOTES: synced + + for curl 7.80.0 + +- THANKS: add contributors from the 7.80.0 cycle + +- [Tatsuhiro Tsujikawa brought this change] + + ngtcp2: advertise h3 as well as h3-29 + + Advertise h3 as well as h3-29 since some servers out there require h3 + for QUIC v1. + + Closes #7979 + +- [Tatsuhiro Tsujikawa brought this change] + + ngtcp2: use QUIC v1 consistently + + Since we switched to v1 quic_transport_parameters codepoint in #7960 + with quictls, lets use QUIC v1 consistently. + + Closes #7979 + +- [Tatsuhiro Tsujikawa brought this change] + + ngtcp2: compile with the latest nghttp3 + + Closes #7978 + +Marc Hoersken (9 Nov 2021) +- tests: add Schannel-specific tests and disable unsupported ones + + Adds Schannel variants of SSLpinning tests that include the option + --ssl-revoke-best-effort to ignore certificate revocation check + failures which is required due to our custom test CA certificate. + + Disable the original variants if the Schannel backend is enabled. + + Also skip all IDN tests which are broken while using an msys shell. + + This is a step to simplify test exclusions for Windows and MinGW. + + Reviewed-by: Jay Satiro + Reviewed-by: Marcel Raad + Reviewed-by: Daniel Stenberg + Closes #7968 + +Daniel Stenberg (8 Nov 2021) +- docs: NAME fixes in easy option man pages + + Closes #7975 + +- [Roger Young brought this change] + + ftp: make the MKD retry to retry once per directory + + Reported-by: Roger Young + Fixes #7967 + Closes #7976 + +- tool_operate: reorder code to avoid compiler warning + + tool_operate.c(889) : warning C4701: potentially uninitialized local + variable 'per' use + + Follow-up to cc71d352651a0d95 + Reported-by: Marc Hörsken + Bug: https://github.com/curl/curl/pull/7922#issuecomment-963042676 + Closes #7971 + +- curl_easy_perform.3: add a para about recv and send data + + Reported-by: Godwin Stewart + Fixes #7973 + Closes #7974 + +- tool_operate: fclose stream only if fopened + + Fixes torture test failures + Follow-up to cc71d352651 + + Closes #7972 + +- libcurl-easy.3: language polish + +- limit-rate.d: this is average over several seconds + + Closes #7970 + +- docs: reduce/avoid English contractions + + You're => You are + Hasn't => Has not + Doesn't => Does not + Don't => Do not + You'll => You will + etc + + Closes #7930 + +- tool_operate: fix torture leaks with etags + + Spotted by torture testing 343 344 345 347. + + Follow-up from cc71d352651a0 + Pointed-out-by: Dan Fandrich + + Closes #7969 + +- [Amaury Denoyelle brought this change] + + ngtcp2: support latest QUIC TLS RFC9001 + + QUIC Transport Parameters Extension has been changed between draft-29 + and latest RFC9001. Most notably, its identifier has been updated from + 0xffa5 to 0x0039. The version is selected through the QUIC TLS library + via the legacy codepoint. + + Disable the usage of legacy codepoint in curl to switch to latest + RFC9001. This is required to be able to keep up with latest QUIC + implementations. + + Acked-by: Tatsuhiro Tsujikawa + Closes #7960 + +- test1173: make manpage-syntax.pl spot \n errors in examples + +- man pages: fix backslash-n in examples + + ... to be proper backslash-backslash-n sequences to render nicely in man + and on website. + + Follow-up to 24155569d8a + Reported-by: Sergey Markelov + + Fixes https://github.com/curl/curl-www/issues/163 + Closes #7962 + +- scripts/release-notes.pl: use out of repo links verbatim in refs + +- tool_operate: a failed etag save now only fails that transfer + + When failing to create the output file for saving an etag, only fail + that particular single transfer and allow others to follow. + + In a serial transfer setup, if no transfer at all is done due to them + all being skipped because of this error, curl will output an error + message and return exit code 26. + + Added test 369 and 370 to verify. + + Reported-by: Earnestly on github + Ref: #7942 + Closes #7945 + +- [Kevin Burke brought this change] + + .github: retry macos "brew install" command on failure + + Previously we saw errors attempting to run "brew install", see + https://github.com/curl/curl/runs/4095721123?check_suite_focus=true for + an example, since this command is idempotent, it is safe to run again. + + Closes #7955 + +- CURLOPT_ALTSVC_CTRL.3: mention conn reuse is preferred + + Ref: https://github.com/curl/curl/discussions/7954 + + Closes #7957 + +- RELEASE-NOTES: synced + +- zuul: pin the quiche build to use an older cmake-rs + + The latest cmake-rs assumes cmake's --parallel works. That was added in + cmake 3.12, but a lot of our CI builds run on Ubuntu Bionic which only + has cmake 3.10. + + Fixes #7927 + Closes #7952 + +- [Marc Hoersken brought this change] + + Revert "src/tool_filetime: disable -Wformat on mingw for this file" + + This reverts commit 7c88fe375b15c44d77bccc9ab733b8069d228e6f. + + Follow up to #6535 as the pragma is obsolete with warnf + + Closes #7941 + +Jay Satiro (2 Nov 2021) +- schannel: fix memory leak due to failed SSL connection + + - Call schannel_shutdown if the SSL connection fails. + + Prior to this change schannel_shutdown (which shuts down the SSL + connection as well as memory cleanup) was not called when the SSL + connection failed (eg due to failed handshake). + + Co-authored-by: Gisle Vanem + + Fixes https://github.com/curl/curl/issues/7877 + Closes https://github.com/curl/curl/pull/7878 + +Daniel Stenberg (2 Nov 2021) +- Curl_updateconninfo: store addresses for QUIC connections too + + So that CURLINFO_PRIMARY_IP etc work for HTTP/3 like for other HTTP + versions. + + Reported-by: Jerome Mao + Fixes #7939 + Closes #7944 + +- [Sergio Durigan Junior brought this change] + + curl.1: fix typos in the manpage + + s/transfering/transferring/ + s/transfered/transferred/ + + Signed-off-by: Sergio Durigan Junior + Closes #7937 + +Marc Hoersken (1 Nov 2021) +- tests/smbserver.py: fix compatibility with impacket 0.9.23+ + + impacket now performs sanity checks if the requested and to + be served file path actually is inside the real share path. + + Ref: https://github.com/SecureAuthCorp/impacket/pull/1066 + + Fixes #7924 + Closes #7935 + +Daniel Stenberg (1 Nov 2021) +- docs: reduce use of "very" + + "Very" should be avoided in most texts. If intensifiers are needed, try + find better words instead. + + Closes #7936 + +- [Tatsuhiro Tsujikawa brought this change] + + ngtcp2: specify the missing required callback functions + + Closes #7929 + +- CURLOPT_[PROXY]_SSL_CIPHER_LIST.3: bold instead of quote + + Bold the example ciphers instead of using single quotes, which then also + avoids the problem of how to use single quotes when first in a line. + + Also rephrased the pages a little. + + Reported-by: Sergio Durigan Junior + Ref: #7928 + Closes #7934 + +- gen.pl: replace leading single quotes with \(aq + + ... and allow single quotes to be used "normally" in the .d files. + + Makes the output curl.1 use better nroff. + + Reported-by: Sergio Durigan Junior + Ref: #7928 + Closes #7933 + +Marc Hoersken (1 Nov 2021) +- tests: kill some test servers afterwards to avoid locked logfiles + + Reviewed-by: Daniel Stenberg + Closes #7925 + +Daniel Stenberg (1 Nov 2021) +- smooth-gtk-thread.c: enhance the mutex lock use + + Reported-by: ryancaicse on github + Fixes #7926 + Closes #7931 + +Marc Hoersken (31 Oct 2021) +- CI/runtests.pl: restore -u flag, but remove it from CI runs + + This makes it possible to use -u again for local testing, + but removes the flag from CI config files and make targets. + + Reviewed-by: Daniel Stenberg + + Partially reverts #7841 + Closes #7921 + +Daniel Stenberg (29 Oct 2021) +- [Jonathan Cardoso Machado brought this change] + + CURLOPT_HSTSWRITEFUNCTION.3: using CURLOPT_HSTS_CTRL is required + + Closes #7923 + +- [Axel Morawietz brought this change] + + imap: display quota information + + Show response to "GETQUOTAROOT INBOX" command. + + Closes #6973 + +- RELEASE-NOTES: synced + +- [Boris Rasin brought this change] + + cmake: fix error getting LOCATION property on non-imported target + + Closes #7885 + +- [x2018 brought this change] + + url: check the return value of curl_url() + + Closes #7917 + +- [Roy Li brought this change] + + configure.ac: replace krb5-config with pkg-config + + The rationale is that custom *-config tools don't work well when + cross-compiling or using sysroots (such as when using Yocto project) and + require custom fixing for each of them; pkg-config on the other hand + works similarly everywhere. + + Signed-off-by: Roy Li + Signed-off-by: Alexander Kanavin + + Closes #7916 + +- test1160: edited to work with hyper + + Closes #7912 + +- data/DISABLED: enable tests that now work with hyper + + Closes #7911 + +- test559: add 'HTTP' in keywords + + Makes it run fine with hyper + + Closes #7911 + +- test552: updated to work with hyper + + Closes #7911 + +Marc Hoersken (27 Oct 2021) +- github: fix incomplete permission to label PRs for Hacktoberfest + + Unfortunately the GitHub API requires a token with write permission + for both issues and pull-requests to edit labels on even just PRs. + + Follow up to #7897 + +Daniel Stenberg (27 Oct 2021) +- opt-manpages: use 'Added in' instead of 'Since' + + Closes #7913 + +Marc Hoersken (27 Oct 2021) +- github: fix missing permission to label PRs for Hacktoberfest + + Follow up to #7897 + + Test references to see if permissions are now sufficient: + + Closes #7832 + Closes #7897 + +- CI: more use of test-ci make target and verbose output + + Replace test-nonflaky with test-ci and enable verbose output + in all remaining CIs except Zuul which is customized a lot. + + Reviewed-by: Daniel Stenberg + Reviewed-by: Jay Satiro + + Follow up to #7785 + Closes #7832 + +- github: add support for Hacktoberfest using labels + + Automatically add hacktoberfest-accepted label to PRs opened between + September 30th and November 1st once a commit with a close reference + to it is pushed onto the master branch. + + With this workflow we can participate in Hacktoberfest while not + relying on GitHub to identify PRs as merged due to our rebasing. + + Requires hacktoberfest-accepted labels to exist for PRs on the + participating repository. Also requires hacktoberfest topic on + the participating repository to avoid applying to forked repos. + + Reviewed-by: Daniel Stenberg + + Fixes #7865 + Closes #7897 + +Daniel Stenberg (27 Oct 2021) +- http: reject HTTP response codes < 100 + + ... which then also includes negative ones as test 1430 uses. + + This makes native + hyper backend act identically on this and therefore + test 1430 can now be enabled when building with hyper. Adjust test 1431 + as well. + + Closes #7909 + +- [Kerem Kat brought this change] + + docs: fix typo in CURLOPT_TRAILERFUNCTION example + + Closes #7910 + +- docs/HYPER: remove some remaining issues, add HTTP/0.9 limitation + +- configure: when hyper is selected, deselect nghttp2 + + Closes #7908 + +- [Patrick Monnerat brought this change] + + sendf: accept zero-length data in Curl_client_write() + + Historically, Curl_client_write() used a length value of 0 as a marker + for a null-terminated data string. This feature has been removed in + commit f4b85d2. To detect leftover uses of the feature, a DEBUGASSERT + statement rejecting a length with value 0 was introduced, effectively + precluding use of this function with zero-length data. + + The current commit removes the DEBUGASSERT and makes the function to + return immediately if length is 0. + + A direct effect is to fix trying to output a zero-length distinguished + name in openldap. + + Another DEBUGASSERT statement is also rephrased for better readability. + + Closes #7898 + +- hyper: disable test 1294 since hyper doesn't allow such crazy headers + + Closes #7905 + +- c-hyper: make CURLOPT_SUPPRESS_CONNECT_HEADERS work + + Verified by the enabled test 1288 + + Closes #7905 + +- test1287: make work on hyper + + Closes #7905 + +- test1266/1267: disabled on hyper: no HTTP/0.9 support + + Closes #7905 + +Viktor Szakats (25 Oct 2021) +- Makefile.m32: fix to not require OpenSSL with -libssh2 or -rtmp options + + Previously, -libssh2/-rtmp options assumed that OpenSSL is also enabled + (and then failed with an error when not finding expected OpenSSL headers), + but this isn't necessarly true, e.g. when building both libssh2 and curl + against Schannel. This patch makes sure to only enable the OpenSSL backend + with -libssh2/-rtmp, when there was no SSL option explicitly selected. + + - Re-implement the logic as a single block of script. + - Also fix an indentation while there. + + Assisted-by: Jay Satiro + + Closes #7895 + +Daniel Stenberg (25 Oct 2021) +- docs: consistent use of "Added in" + + Make them all say "Added in [version]" without using 'curl' or 'libcurl' + in that phrase. + +- man pages: require all to use the same section header order + + This is the same order we already enforce among the options' man pages: + consistency is good. Add lots of previously missing examples. + + Adjust the manpage-syntax script for this purpose, used in test 1173. + + Closes #7904 + +- [David Hu brought this change] + + docs/HTTP3: improve build instructions + + 1. If writing to a system path if the command is not prefixed with + `sudo` it will cause a permission denied error + + 2. The patched OpenSSL branch has been updated to `openssl-3.0.0+quic` + to match upstream OpenSSL version. + + 3. We should not disable GnuTLS docs. + + Updated some commands about `make install` + + Closes #7842 + +- [Ricardo Martins brought this change] + + CMake: restore support for SecureTransport on iOS + + Restore support for building curl for iOS with SecureTransport enabled. + + Closes #7501 + +- tests: enable more tests with hyper + + Adjusted 1144, 1164 and 1176. + + Closes #7900 + +- docs: provide "RETURN VALUE" section for more func manpages + + Three were missing, one used a non-standard name for the header. + + Closes #7902 + +Jay Satiro (25 Oct 2021) +- curl_multi_socket_action.3: add a "RETURN VALUE" section + + .. because it may not be immediately clear to the user what + curl_multi_socket_action returns. + + Ref: https://curl.se/mail/lib-2021-10/0035.html + + Closes https://github.com/curl/curl/pull/7901 + +Daniel Stenberg (24 Oct 2021) +- RELEASE-NOTES: synced + +- [Samuel Henrique brought this change] + + tests: use python3 in test 1451 + + This is a continuation of commit ec91b5a69000bea0794bbb3 in which + changing this test was missed. There are no other python2 leftovers + now. + + Based on a Debian patch originally written by Alessandro Ghedini + + + Closes #7899 + +- [Eddie Lumpkin brought this change] + + lib: fixing comment spelling typos in lib files + + Closes #7894 + Signed-off-by: ewlumpkin + +- openssl: if verifypeer is not requested, skip the CA loading + + It was previously done mostly to show a match/non-match in the verbose + output even when verification was not asked for. This change skips the + loading of the CA certs unless verifypeer is set to save memory and CPU. + + Closes #7892 + +- curl-confopts.m4: remove --enable/disable-hidden-symbols + + These configure options have been saying "deprecated" since 9e24b9c7af + (April 2012). It was about time we remove them. + + Closes #7891 + +- c-hyper: don't abort CONNECT responses early when auth-in-progress + + ... and make sure to stop ignoring the body once the CONNECT is done. + + This should make test 206 work proper again and not be flaky. + + Closes #7889 + +- hyper: does not support disabling CURLOPT_HTTP_TRANSFER_DECODING + + Simply because hyper doesn't have this ability. Mentioned in docs now. + + Skip test 326 then + + Closes #7889 + +- test262: don't attempt with hyper + + This test verifies that curl works with binary zeroes in HTTP response + headers and hyper refuses such. They're not kosher http. + + Closes #7889 + +- c-hyper: make test 217 run + + Closes #7889 + +- DISABLED: enable test 209+213 for hyper + + Follow-up to 823d3ab855c + + Closes #7889 + +- test207: accept a different error code for hyper + + It returns HYPERE_UNEXPECTED_EOF for this case which we convert to the + somewhat generic CURLE_RECV_ERROR. + + Closes #7889 + +- [Érico Nogueira brought this change] + + INSTALL: update symbol hiding option + + --enable-hidden-symbols was deprecated in + 9e24b9c7afbcb81120af4cf3f6cdee49a06d8224. + + Closes #7890 + +- http_proxy: multiple CONNECT with hyper done better + + Enabled test 206 + + Closes #7888 + +- hyper: pass the CONNECT line to the debug callback + + Closes #7887 + +- mailmap: Malik Idrees Hasan Khan + +Jay Satiro (21 Oct 2021) +- [Malik Idrees Hasan Khan brought this change] + + build: fix typos + + Closes https://github.com/curl/curl/pull/7886 + +- URL-SYNTAX: add IMAP UID SEARCH example + + - Explain the difference between IMAP search via URL (which returns + message sequence numbers) and IMAP search via custom request (which + can return UID numbers if prefixed with UID, eg "UID SEARCH ..."). + + Bug: https://github.com/curl/curl/issues/7626 + Reported-by: orycho@users.noreply.github.com + + Ref: https://github.com/curl/curl/issues/2789 + + Closes https://github.com/curl/curl/pull/7881 + +Daniel Stenberg (20 Oct 2021) +- manpage: adjust the asterisk in some SYNOPSIS sections + + Closes #7884 + +- curl_multi_perform.3: polish wording + + - simplify the example by using curl_multi_poll + + - mention curl_multi_add_handle in the text + + - cut out the description of pre-7.20.0 return code behavior - that version + is now more than eleven years old and is basically no longer out there + + - adjust the "typical usage" to mention curl_multi_poll + + Closes #7883 + +- docs/THANKS: removed on request + +- FAQ: polish the explanation of libcurl + +- curl_easy_perform.3: minor wording tweak + +- [Erik Stenlund brought this change] + + mime: mention CURL_DISABLE_MIME in comment + + CURL_DISABLE_MIME is not mentioned in the comment describing the if else + preprocessor directive. + + Closes #7882 + +- tls: remove newline from three infof() calls + + Follow-up to e7416cf + + Reported-by: billionai on github + Fixes #7879 + Closes #7880 + +- RELEASE-NOTES: synced + +- curl_gssapi: fix build warnings by removing const + + Follow-up to 20e980f85b0ea6 + + In #7875 these inits were modified but I get two warnings that these new + typecasts are necessary for. + + Closes #7876 + +- [Bo Anderson brought this change] + + curl_gssapi: fix link error on macOS Monterey + + Fixes #7657 + Closes #7875 + +- test1185: verify checksrc + + Closes #7866 + +- checksrc: improve the SPACESEMICOLON error message + + and adjust the MULTISPACE one to use plural + + Closes #7866 + +- url: set "k->size" -1 at start of request + + The size of the transfer is unknown at that point. + + Fixes #7871 + Closes #7872 + +Daniel Gustafsson (18 Oct 2021) +- doh: remove experimental code for DoH with GET + + The code for sending DoH requests with GET was never enabled in a way + such that it could be used or tested. As there haven't been requests + for this feature, and since it at this is effectively dead, remove it + and favor reimplementing the feature in case anyone is interested. + + Closes #7870 + Reviewed-by: Daniel Stenberg + +Daniel Stenberg (18 Oct 2021) +- cirrus: remove FreeBSD 11.4 from the matrix + + It has reached End-Of-Life and causes some LDAP CI issues. + + Closes #7869 + +- cirrus: switch to openldap24-client + + ... as it seems openldap-client doesn't exist anymore. + + Reported-by: Jay Satiro + Fixes #7868 + Closes #7869 + +- checksrc: ignore preprocessor lines + + In order to check the actual code better, checksrc now ignores + everything that look like preprocessor instructions. It also means + that code in macros are now longer checked. + + Note that some rules then still don't need to be followed when code is + exactly below a cpp instruction. + + Removes two checksrc exceptions we needed previously because of + preprocessor lines being checked. + + Reported-by: Marcel Raad + Fixes #7863 + Closes #7864 + +- urlapi: skip a strlen(), pass in zero + + ... to let curl_easy_escape() itself do the strlen. This avoids a (false + positive) Coverity warning and it avoids us having to store the strlen() + return value in an int variable. + + Reviewed-by: Daniel Gustafsson + Closes #7862 + +- misc: update copyright years + +- examples/htmltidy: correct wrong printf() use + + ... and update the includes to match how current htmltidy wants them + used. + + Reported-by: Stathis Kapnidis + Fixes #7860 + Closes #7861 + +Jay Satiro (15 Oct 2021) +- http: set content length earlier + + - Make content length (ie download size) accessible to the user in the + header callback, but only after all headers have been processed (ie + only in the final call to the header callback). + + Background: + + For a long time the content length could be retrieved in the header + callback via CURLINFO_CONTENT_LENGTH_DOWNLOAD_T as soon as it was parsed + by curl. + + Changes were made in 8a16e54 (precedes 7.79.0) to ignore content length + if any transfer encoding is used. A side effect of that was that + content length was not set by libcurl until after the header callback + was called the final time, because until all headers are processed it + cannot be determined if content length is valid. + + This change keeps the same intention --all headers must be processed-- + but now the content length is available before the final call to the + header function that indicates all headers have been processed (ie + a blank header). + + Bug: https://github.com/curl/curl/commit/8a16e54#r57374914 + Reported-by: sergio-nsk@users.noreply.github.com + + Co-authored-by: Daniel Stenberg + + Fixes https://github.com/curl/curl/issues/7804 + Closes https://github.com/curl/curl/pull/7803 + +Daniel Stenberg (15 Oct 2021) +- [Abhinav Singh brought this change] + + aws-sigv4: make signature work when post data is binary + + User sets the post fields size for binary data. Hence, we should not be + using strlen on it. + + Added test 1937 and 1938 to verify. + + Closes #7844 + +- [a1346054 brought this change] + + MacOSX-Framework: remove redundant ';' + + Closes #7859 + +- RELEASE-NOTES: synced + +- openssl: with OpenSSL 1.1.0+ a failed RAND_status means goaway + + One reason we know it can fail is if a provider is used that doesn't do + a proper job or is wrongly configured. + + Reported-by: Michael Baentsch + Fixes #7840 + Closes #7856 + +Marcel Raad (14 Oct 2021) +- [Ryan Mast brought this change] + + cmake: add CURL_ENABLE_SSL option and make CMAKE_USE_* SSL backend options depend on it + + Closes https://github.com/curl/curl/pull/7822 + +Daniel Stenberg (14 Oct 2021) +- http: remove assert that breaks hyper + + Reported-by: Jay Satiro + Fixes #7852 + Closes #7855 + +- http_proxy: fix one more result assign for hyper + + and remove the bad assert again, since it was run even with no error! + + Closes #7854 + +Jay Satiro (14 Oct 2021) +- sws: fix memory leak on exit + + - Free the allocated http request struct on cleanup. + + Prior to this change if sws was built with leak sanitizer it would + report a memory leak error during testing. + + Closes https://github.com/curl/curl/pull/7849 + +Daniel Stenberg (14 Oct 2021) +- c-hyper: make Curl_http propagate errors better + + Pass on better return codes when errors occur within Curl_http instead + of insisting that CURLE_OUT_OF_MEMORY is the only possible one. + + Pointed-out-by: Jay Satiro + Closes #7851 + +- http_proxy: make hyper CONNECT() return the correct error code + + For every 'goto error', make sure the result variable holds the error + code for what went wrong. + + Reported-by: Rafał Mikrut + Fixes #7825 + Closes #7846 + +- docs/Makefile.am: repair 'make html' + + by removing index.html which isn't around anymore + + Closes #7853 + +- [Борис Верховский brought this change] + + curl: correct grammar in generated libcurl code + + Closes #7802 + +- tests: disable test 2043 + + It uses revoked.badssl.com which now is expired and therefor this now + permafails. We should not use external sites for tests, this test should + be converted to use our own infra. + + Closes #7845 + +- runtests: split out ignored tests + + Report ignore tests separately from the actual fails. + + Don't exit non-zero if test servers couldn't get killed. + + Assisted-by: Jay Satiro + + Fixes #7818 + Closes #7841 + +- http2: make getsock not wait for write if there's no remote window + + While uploading, check for remote window availability in the getsock + function so that we don't wait for a writable socket if no data can be + sent. + + Reported-by: Steini2000 on github + Fixes #7821 + Closes #7839 + +- test368: verify dash is appended for "-r [num]" + + Follow-up to 8758a26f8878 + +- [Борис Верховский brought this change] + + curl: actually append "-" to --range without number only + + Closes #7837 + +- RELEASE-NOTES: synced + +- urlapi: URL decode percent-encoded host names + + The host name is stored decoded and can be encoded when used to extract + the full URL. By default when extracting the URL, the host name will not + be URL encoded to work as similar as possible as before. When not URL + encoding the host name, the '%' character will however still be encoded. + + Getting the URL with the CURLU_URLENCODE flag set will percent encode + the host name part. + + As a bonus, setting the host name part with curl_url_set() no longer + accepts a name that contains space, CR or LF. + + Test 1560 has been extended to verify percent encodings. + + Reported-by: Noam Moshe + Reported-by: Sharon Brizinov + Reported-by: Raul Onitza-Klugman + Reported-by: Kirill Efimov + Fixes #7830 + Closes #7834 + +Marc Hoersken (8 Oct 2021) +- CI/makefiles: introduce dedicated test target + + Make it easy to use the same set of test flags + throughout all current and future CI builds. + + Reviewed-by: Jay Satiro + + Follow up to #7690 + Closes #7785 + +Daniel Stenberg (8 Oct 2021) +- maketgz: redirect updatemanpages.pl output to /dev/null + +- CURLOPT_HTTPHEADER.3: add descripion for specific headers + + Settting Host: or Transfer-Encoding: chunked actually have special + meanings to libcurl. This change tries to document them + + Closes #7829 + +- c-hyper: use hyper_request_set_uri_parts to make h2 better + + and make sure to not send Host: over h2. + + Fixes #7679 + Reported-by: David Cook + Closes #7827 + +- [Michael Afanasiev brought this change] + + curl-openssl.m4: modify library order for openssl linking + + lcrypto may depend on lz, and configure corrently fails with when + statically linking as the order is "-lz -lcrypto". This commit switches + the order to "-lcrypto -lz". + + Closes #7826 + +Marcel Raad (7 Oct 2021) +- sha256: use high-level EVP interface for OpenSSL + + Available since OpenSSL 0.9.7. The low-level SHA256 interface is + deprecated in OpenSSL v3, and its usage was discouraged even before. + + Closes https://github.com/curl/curl/pull/7808 + +- curl_ntlm_core: use OpenSSL only if DES is available + + This selects another SSL backend then if available, or otherwise at + least gives a meaningful error message. + + Closes https://github.com/curl/curl/pull/7808 + +- md5: fix compilation with OpenSSL 3.0 API + + Only use OpenSSL's MD5 code if it's available. + + Also fix wolfSSL build with `NO_MD5`, in which case neither the + wolfSSL/OpenSSL implementation nor the fallback implementation was + used. + + Closes https://github.com/curl/curl/pull/7808 + +Daniel Stenberg (7 Oct 2021) +- print_category: printf %*s needs an int argument + + ... not a size_t! + + Detected by Coverity: CID 1492331. + Closes #7823 + +Jay Satiro (7 Oct 2021) +- version_win32: use actual version instead of manifested version + + - Use RtlVerifyVersionInfo instead of VerifyVersionInfo, when possible. + + Later versions of Windows have normal version functions that compare and + return versions based on the way the application is manifested, instead + of the actual version of Windows the application is running on. We + prefer the actual version of Windows so we'll now call the Rtl variant + of version functions (RtlVerifyVersionInfo) which does a proper + comparison of the actual version. + + Reported-by: Wyatt O'Day + + Ref: https://github.com/curl/curl/pull/7727 + + Fixes https://github.com/curl/curl/issues/7742 + Closes https://github.com/curl/curl/pull/7810 + +Daniel Stenberg (6 Oct 2021) +- RELEASE-NOTES: synced + +- http: fix Basic auth with empty name field in URL + + Add test 367 to verify. + + Reported-by: Rick Lane + Fixes #7819 + Closes #7820 + +- [Jeffrey Tolar brought this change] + + CURLOPT_MAXLIFETIME_CONN: maximum allowed lifetime for conn reuse + + ... and close connections that are too old instead of reusing them. + + By default, this behavior is disabled. + + Bug: https://curl.se/mail/lib-2021-09/0058.html + Closes #7751 + +Daniel Gustafsson (6 Oct 2021) +- docs/examples: add missing binaries to gitignore + + Commit f65d7889b added getreferrer, and commit ae8e11ed5 multi-legacy, + both of which missed adding .gitignore clauses for the built binaries. + + Closes #7817 + Reviewed-by: Daniel Stenberg + +Daniel Stenberg (5 Oct 2021) +- [Josip Medved brought this change] + + HTTP3: fix the HTTP/3 Explained book link + + Closes #7813 + +- [Lucas Holt brought this change] + + misc: fix a few issues on MidnightBSD + + Closes #7812 + +Daniel Gustafsson (4 Oct 2021) +- [8U61ife brought this change] + + tool_main: fix typo in comment + + Closes: #7811 + Reviewed-by: Daniel Gustafsson + +Daniel Stenberg (4 Oct 2021) +- [Ryan Mast brought this change] + + BINDINGS: URL updates + + For cpr, BBHTTP, Eiffel, Harbour, Haskell, Mono, and Rust + + Closes #7809 + +- scripts/delta: hide a git error message we don't care about + + fatal: path 'src/tool_listhelp.c' exists on disk, but not in [tag] + +- [Patrick Monnerat brought this change] + + sasl: binary messages + + Capabilities of sasl module are extended to exchange messages in binary + as an alternative to base64. + + If http authentication flags have been set, those are used as sasl + default preferred mechanisms. + + Closes #6930 + +- [Hayden Roche brought this change] + + wolfssl: use for SHA256, MD4, MD5, and setting DES odd parity + + Prior to this commit, OpenSSL could be used for all these functions, but + not wolfSSL. This commit makes it so wolfSSL will be used if USE_WOLFSSL + is defined. + + Closes #7806 + +- scripts/delta: count command line options in the new file + + ... which makes the shown delta number wrong until next release. + +- RELEASE-NOTES: synced + +- print_category: print help descriptions aligned + + Adjust the description position to make an aligned column when doing + help listings, which is more pleasing to the eye. + + Suggested-by: Gisle Vanem + Closes #7792 + +- lib/mk-ca-bundle.pl: skip certs passed Not Valid After date + + With this change applied, the now expired 'DST Root CA X3' cert will no + longer be included in the output. + + Details: https://letsencrypt.org/docs/dst-root-ca-x3-expiration-september-2021/ + + Closes #7801 + +- tool_listhelp: easier to generate with gen.pl + + tool_listhelp.c is now a separate file with only the command line --help + output, exactly as generated by gen.pl. This makes it easier to generate + updates according to what's in the docs/cmdline-opts docs. + + cd $srcroot/docs/cmdline-opts + ./gen.pl listhelp *.d > $srcroot/src/tool_listhelp.c + + With a configure build, this also works: + + make -C src listhelp + + Closes #7787 + +- [Anthony Hu brought this change] + + wolfssl: allow setting of groups/curves + + In particular, the quantum safe KEM and hybrid curves if wolfSSL is + built to support them. + + Closes #7728 + +- [Jan Mazur brought this change] + + connnect: use sysaddr_un fron sys/un.h or custom-defined for windows + + Closes #7737 + +Jay Satiro (30 Sep 2021) +- [Rikard Falkeborn brought this change] + + hostip: Move allocation to clarify there is no memleak + + By just glancing at the code, it looks like there is a memleak if the + call to Curl_inet_pton() fails. Looking closer, it is clear that the + call to Curl_inet_pton() can not fail, so the code will never leak + memory. However, we can make this obvious by moving the allocation + after the if-statement. + + Closes https://github.com/curl/curl/pull/7796 + +Daniel Stenberg (30 Sep 2021) +- gen.pl: make the output date format work better + + Follow-up to 15910dfd143dd + + The previous strftime format used didn't work correctly on Windows, so + change to %B %d %Y which today looks like "September 29 2021". + + Reported-by: Gisle Vanem + Bug: #7782 + Closes #7793 + +- typecheck-gcc.h: add CURLOPT_PREREQDATA awareness + + Follow-up to a517378de58358a + + To make test 1912 happy again + + Closes #7799 + +Marcel Raad (29 Sep 2021) +- configure: remove `HAVE_WINSOCK_H` definition + + It's not used anymore. + + Closes https://github.com/curl/curl/pull/7795 + +- CMake: remove `HAVE_WINSOCK_H` definition + + It's not used anymore. + + Closes https://github.com/curl/curl/pull/7795 + +- config: remove `HAVE_WINSOCK_H` definition + + It's not used anymore. + + Closes https://github.com/curl/curl/pull/7795 + +- lib: remove `HAVE_WINSOCK_H` usage + + WinSock v1 is not supported anymore. Exclusively use `HAVE_WINSOCK2_H` + instead. + + Closes https://github.com/curl/curl/pull/7795 + +Daniel Stenberg (29 Sep 2021) +- easyoptions: add the two new PRE* options + + Follow-up to a517378de58358a + + Also fix optiontable.pl to do the correct remainder on the entry. + + Reported-by: Gisle Vanem + Bug: https://github.com/curl/curl/commit/a517378de58358a85b7cfe9efecb56051268f629#commitcomment-57224830 + Closes #7791 + +- Revert "build: remove checks for WinSock 1" + + Due to CI issues + + This reverts commit c2ea04f92b00b6271627cb218647527b5a50f2fc. + + Closes #7790 + +Daniel Gustafsson (29 Sep 2021) +- lib: avoid fallthrough cases in switch statements + + Commit b5a434f7f0ee4d64857f8592eced5b9007d83620 inhibits the warning + on implicit fallthrough cases, since the current coding of indicating + fallthrough with comments is falling out of fashion with new compilers. + This attempts to make the issue smaller by rewriting fallthroughs to no + longer fallthrough, via either breaking the cases or turning switch + statements into if statements. + + lib/content_encoding.c: the fallthrough codepath is simply copied + into the case as it's a single line. + lib/http_ntlm.c: the fallthrough case skips a state in the state- + machine and fast-forwards to NTLMSTATE_LAST. Do this before the + switch statement instead to set up the states that we actually + want. + lib/http_proxy.c: the fallthrough is just falling into exiting the + switch statement which can be done easily enough in the case. + lib/mime.c: switch statement rewritten as if statement. + lib/pop3.c: the fallthrough case skips to the next state in the + statemachine, do this explicitly instead. + lib/urlapi.c: switch statement rewritten as if statement. + lib/vssh/wolfssh.c: the fallthrough cases fast-forwards the state + machine, do this by running another iteration of the switch + statement instead. + lib/vtls/gtls.c: switch statement rewritten as if statement. + lib/vtls/nss.c: the fallthrough codepath is simply copied into the + case as it's a single line. Also twiddle a comment to not be + inside a non-brace if statement. + + Closes: #7322 + See-also: #7295 + Reviewed-by: Daniel Stenberg + +Marcel Raad (28 Sep 2021) +- config-win32ce: enable WinSock 2 + + WinSock 2.2 is supported by Windows CE .NET 4.1 (from 2002, out of + support since 2013). + + Ref: https://docs.microsoft.com/en-us/previous-versions/windows/embedded/ms899586(v=msdn.10) + + Closes https://github.com/curl/curl/pull/7778 + +- externalsocket: use WinSock 2.2 + + That's the only version we support. + + Closes https://github.com/curl/curl/pull/7778 + +- build: remove checks for WinSock 1 + + It's not supported anymore. + + Closes https://github.com/curl/curl/pull/7778 + +Daniel Stenberg (28 Sep 2021) +- scripts/copyright: .muse is .lift now + + And update 5 files with old copyright year range + +- cmdline-opts: made the 'Added:' field mandatory + + Since "too old" versions are no longer included in the generated man + page, this field is now mandatory so that it won't be forgotten and then + not included in the documentation. + + Closes #7786 + +- curl.1: remove mentions of really old version changes + + To make the man page more readable, this change removes all references + to changes in support/versions etc that happened before 7.30.0 from the + curl.1 output file. 7.30.0 was released on Apr 12 2013. This particular + limit is a bit arbitrary but was fairly easy to grep for. + + It is handled like this: the 'Added' keyword is only used in output if + it refers to 7.30.0 or later. All occurances of "(Added in $VERSION)" in + description will be stripped out if the mentioned $VERSION is from + before 7.30.0. It is therefore important that the "Added in..." + references are always written exactly like that - and on a single line, + not split over two. + + This change removes about 80 version number references from curl.1, down + to 138 from 218. + + Closes #7786 + +- RELEASE-NOTES: synced + +- tool_cb_prg: make resumed upload progress bar show better + + This is a regression that was *probably* injected in the larger progress + bar overhaul in 2018. + + Reported-by: beslick5 on github + Fixes #7760 + Closes #7777 + +- gen.pl: insert the current date and version in generated man page + + Reported-by: Gisle Vanem + Ref: #7780 + Closes #7782 + +- NTLM: use DES_set_key_unchecked with OpenSSL + + ... as the previously used function DES_set_key() will in some cases + reject using a key that it deems "weak" which will cause curl to + continue using the unitialized buffer content as key instead. + + Assisted-by: Harry Sintonen + Fixes #7779 + Closes #7781 + +Marc Hoersken (27 Sep 2021) +- CI: align make and test flags in various config files + + 1. Use Makefile target to run tests in autotools builds on AppVeyor. + 2. Disable testing of SCP protocol on native Windows environments. + 3. Remove redundant parameters -a -p from target test-nonflaky. + 4. Don't use -vc parameter which is reserved for debugging. + + Replaces #7591 + Closes #7690 + +Daniel Stenberg (27 Sep 2021) +- mailmap: unify Max! + +- [Max Dymond brought this change] + + CURLOPT_PREREQFUNCTION: add new callback + + Triggered before a request is made but after a connection is set up + + Changes: + + - callback: Update docs and callback for pre-request callback + - Add documentation for CURLOPT_PREREQDATA and CURLOPT_PREREQFUNCTION, + - Add redirect test and callback failure test + - Note that the function may be called multiple times on a redirection + - Disable new 2086 test due to Windows weirdness + + Closes #7477 + +- KNOWN_BUGS: HTTP/2 connections through HTTPS proxy frequently stall + + Closes #6936 + +- TODO: make configure use --cache-file more and better + + Closes #7753 + +- [Sergey Markelov brought this change] + + urlapi: support UNC paths in file: URLs on Windows + + - file://host.name/path/file.txt is a valid UNC path + \\host.name\path\files.txt to a non-local file transformed into URI + (RFC 8089 Appendix E.3) + + - UNC paths on other OSs must be smb: URLs + + Closes #7366 + +- [Gleb Ivanovsky brought this change] + + urlapi: add curl_url_strerror() + + Add curl_url_strerror() to convert CURLUcode into readable string and + facilitate easier troubleshooting in programs using URL API. + Extend CURLUcode with CURLU_LAST for iteration in unit tests. + Update man pages with a mention of new function. + Update example code and tests with new functionality where it fits. + + Closes #7605 + +- RELEASE-NOTES: synced + +- [Mats Lindestam brought this change] + + libssh2: add SHA256 fingerprint support + + Added support for SHA256 fingerprint in command line curl and in + libcurl. + + Closes #7646 + +- libcurl.rc: switch out the copyright symbol for plain ASCII + + Reported-by: Vitaly Varyvdin + Assisted-by: Viktor Szakats + Fixes #7765 + Closes #7776 + +- [Jun-ya Kato brought this change] + + ngtcp2: fix QUIC transport parameter version + + fix inappropriate version setting for QUIC transport parameters. + this patch keeps curl with ngtcp2 uses QUIC draft version (h3-29). + + Closes #7771 + +- examples/imap-append: fix end-of-data check + + Reported-by: Alexander Chuykov + Fixes #7774 + Closes #7775 + +Michael Kaufmann (24 Sep 2021) +- vtls: Fix a memory leak if an SSL session cannot be added to the cache + + On connection shutdown, a new TLS session ticket may arrive after the + SSL session cache has already been destructed. In this case, the new + SSL session cannot be added to the SSL session cache. + + The callers of Curl_ssl_addsessionid() need to know whether the SSL + session has been added to the cache. If it has not been added, the + reference counter of the SSL session must not be incremented, or memory + used by the SSL session must be freed. This is now possible with the new + output parameter "added" of Curl_ssl_addsessionid(). + + Fixes #7683 + Closes #7752 + +Daniel Stenberg (24 Sep 2021) +- [Momoka Yamamoto brought this change] + + HTTP3.md: use 'autoreconf -fi' instead of buildconf + + buildconf is not used since #5853 + + Closes #7746 + +- GIT-INFO: rephrase to adapt to s/buildconf/autoreconf + +- [h1zzz brought this change] + + llist: remove redundant code, branch will not be executed + + Closes #7770 + +- [tlahn brought this change] + + HTTP-COOKIES.md: remove duplicate 'each' + + Closes #7772 + +Jay Satiro (24 Sep 2021) +- [Joel Depooter brought this change] + + libssh2: Get the version at runtime if possible + + Previously this code used a compile time constant, meaning that libcurl + always reported the libssh2 version that libcurl was built with. This + could differ from the libssh2 version actually being used. The new code + uses the CURL_LIBSSH2_VERSION macro, which is defined in ssh.h. The + macro calls the libssh2_version function if it is available, otherwise + it falls back to the compile time version. + + Closes https://github.com/curl/curl/pull/7768 + +- [Joel Depooter brought this change] + + schannel: fix typo + + Closes https://github.com/curl/curl/pull/7769 + +Daniel Stenberg (23 Sep 2021) +- cmake: with OpenSSL, define OPENSSL_SUPPRESS_DEPRECATED + + To avoid the "... is deprecated" warnings brought by OpenSSL v3. + (We need to address the underlying code at some point of course.) + + Assisted-by: Jakub Zakrzewski + Closes #7767 + +- curl-openssl: pass argument to sed single-quoted + + ... instead of using an escaped double-quote. This is an attempt to make + this work better with ksh that otherwise would insist on a double + escape! + + Reported-by: Randall S. Becker + Fixes #7758 + Closes #7764 + +- RELEASE-NOTES: synced + + Bumped curlver to 7.80.0-dev + +- [a1346054 brought this change] + + misc: fix typos in docs and comments + + No user facing output from curl/libcurl is changed by this, just + comments. + + Closes #7747 + +- [Thomas M. DuBuisson brought this change] + + ci: update Lift config to match requirements of curl build + + Also renamed Muse -> Lift, the new tool name. + + Closes #7761 + +- [Rikard Falkeborn brought this change] + + cleanup: constify unmodified static structs + + Constify a number of static structs that are never modified. Make them + const to show this. + + Closes #7759 + +Version 7.79.1 (22 Sep 2021) + +Daniel Stenberg (22 Sep 2021) +- RELEASE-NOTES: synced + + curl 7.79.1 release + +- THANKS: added names from the 7.79.1 release + +- test897: verify delivery of IMAP post-body header content + + The "content" is delivered as "body" by curl, but the envelope continues + after the body and the rest of it should be delivered as header. + + The IMAP server can now get 'POSTFETCH' set to include more data to + include after the body and test 897 is done to verify that such "extra" + header data is in fact delivered by curl as header. + + Ref: #7284 but fails to reproduce the issue + + Closes #7748 + +- KNOWN_BUGS: connection migration doesn't work + + Closes #7695 + +- RELEASE-NOTES: synced + +- http: fix the broken >3 digit response code detection + + When the "reason phrase" in the HTTP status line starts with a digit, + that was treated as the forth response code digit and curl would claim + the response to be non-compliant. + + Added test 1466 to verify this case. + + Regression brought by 5dc594e44f73b17 + Reported-by: Glenn de boer + Fixes #7738 + Closes #7739 + +Jay Satiro (17 Sep 2021) +- strerror: use sys_errlist instead of strerror on Windows + + - Change Curl_strerror to use sys_errlist[errnum] instead of strerror to + retrieve the error message on Windows. + + Windows' strerror writes to a static buffer and is not thread-safe. + + Follow-up to 2f0bb86 which removed most instances of strerror in favor + of calling Curl_strerror (which calls strerror_r for other platforms). + + Ref: https://github.com/curl/curl/pull/7685 + Ref: https://github.com/curl/curl/commit/2f0bb86 + + Closes https://github.com/curl/curl/pull/7735 + +Daniel Stenberg (16 Sep 2021) +- dist: provide lib/.checksrc in the tarball + + So that debug builds work (checksrc really) + + Reported-by: Marcel Raad + Reported-by: tawmoto on github + Fixes #7733 + Closes #7734 + +- TODO: Improve documentation about fork safety + + Closes #6968 + +- hsts: CURLSTS_FAIL from hsts read callback should fail transfer + + ... and have CURLE_ABORTED_BY_CALLBACK returned. + + Extended test 1915 to verify. + + Reported-by: Jonathan Cardoso + Fixes #7726 + Closes #7729 + +- test1184: disable + + The test should be fine and it works for me repeated when run manually, + but clearly it causes CI failures and it needs more research. + + Reported-by: RiderALT on github + Fixes #7725 + Closes #7732 + +- Curl_http2_setup: don't change connection data on repeat invokes + + Regression from 3cb8a748670ab88c (releasde in 7.79.0). That change moved + transfer oriented inits to before the check but also erroneously moved a + few connection oriented ones, which causes problems. + + Reported-by: Evangelos Foutras + Fixes #7730 + Closes #7731 + +- RELEASE-NOTES: synced + + and bump to 7.79.1 + +Kamil Dudka (16 Sep 2021) +- tests/sshserver.pl: make it work with openssh-8.7p1 + + ... by not using options with no argument where an argument is required: + + === Start of file tests/log/ssh_server.log + curl_sshd_config line 6: no argument after keyword "DenyGroups" + curl_sshd_config line 7: no argument after keyword "AllowGroups" + curl_sshd_config line 10: Deprecated option AuthorizedKeysFile2 + curl_sshd_config line 29: Deprecated option KeyRegenerationInterval + curl_sshd_config line 39: Deprecated option RhostsRSAAuthentication + curl_sshd_config line 40: Deprecated option RSAAuthentication + curl_sshd_config line 41: Deprecated option ServerKeyBits + curl_sshd_config line 45: Deprecated option UseLogin + curl_sshd_config line 56: no argument after keyword "AcceptEnv" + curl_sshd_config: terminating, 3 bad configuration options + === End of file tests/log/ssh_server.log + + === Start of file log/sftp_server.log + curl_sftp_config line 33: Unsupported option "rhostsrsaauthentication" + curl_sftp_config line 34: Unsupported option "rsaauthentication" + curl_sftp_config line 52: no argument after keyword "sendenv" + curl_sftp_config: terminating, 1 bad configuration options + Connection closed. + Connection closed + === End of file log/sftp_server.log + + Closes #7724 + +Daniel Stenberg (15 Sep 2021) +- hsts: handle unlimited expiry + + When setting a blank expire string, meaning unlimited, curl would pass + TIME_T_MAX to getime_r() when creating the output, while on 64 bit + systems such a large value cannot be convetered to a tm struct making + curl to exit the loop with an error instead. It can't be converted + because the year it would represent doesn't fit in the 'int tm_year' + field! + + Starting now, unlimited expiry is instead handled differently by using a + human readable expiry date spelled out as "unlimited" instead of trying + to use a distant actual date. + + Test 1660 and 1915 have been updated to help verify this change. + + Reported-by: Jonathan Cardoso + Fixes #7720 + Closes #7721 + +- curl_multi_fdset: make FD_SET() not operate on sockets out of range + + The VALID_SOCK() macro was made to only check for FD_SETSIZE if curl was + built to use select(), even though the curl_multi_fdset() function + always and unconditionally uses FD_SET and needs the check. + + Reported-by: 0xee on github + Fixes #7718 + Closes #7719 + +- FAQ: add GOPHERS + curl works on data, not files + +Version 7.79.0 (14 Sep 2021) + +Daniel Stenberg (14 Sep 2021) +- RELEASE-NOTES: synced + + For the 7.79.0 release + +- THANKS: add contributors from 7.79.0 release cycle + +- FAQ: add two dev related questions + + 8.1 Why does curl use C89? + 8.2 Will curl be rewritten? + + Spell-checked-by: Paul Johnson + Closes #7715 + +- zuul.d/jobs: disable three tests for *-openssl-disable-proxy + + ... as they mysteriously seem to permfail without being related to + proxy. + + Closes #7714 + +- [Patrick Monnerat brought this change] + + ftp,imap,pop3,smtp: reject STARTTLS server response pipelining + + If a server pipelines future responses within the STARTTLS response, the + former are preserved in the pingpong cache across TLS negotiation and + used as responses to the encrypted commands. + + This fix detects pipelined STARTTLS responses and rejects them with an + error. + + CVE-2021-22947 + + Bug: https://curl.se/docs/CVE-2021-22947.html + +- [Patrick Monnerat brought this change] + + ftp,imap,pop3: do not ignore --ssl-reqd + + In imap and pop3, check if TLS is required even when capabilities + request has failed. + + In ftp, ignore preauthentication (230 status of server greeting) if TLS + is required. + + Bug: https://curl.se/docs/CVE-2021-22946.html + + CVE-2021-22946 + +- [z2_ on hackerone brought this change] + + mqtt: clear the leftovers pointer when sending succeeds + + CVE-2021-22945 + + Bug: https://curl.se/docs/CVE-2021-22945.html + +- zuul: bump the rustls job to use v0.7.2 + + ... and add -lm when using a rust library. + + Closes #7701 + +- RELEASE-PROCEDURE: add release dates from now to 8.0.0 in 2023 + +- SECURITY-PROCESS: tweak a little to match current practices + + Closes #7713 + +- http_proxy: fix the User-Agent inclusion in CONNECT + + It should not refer to the uagent string that is allocated and created + for the end server http request, as that pointer may be cleared on + subsequent CONNECT requests. + + Added test case 1184 to verify. + + Reported-by: T200proX7 on github + Fixes #7705 + Closes #7707 + +- Curl_hsts_loadcb: don't attempt to load if hsts wasn't inited + + Reported-by: Jonathan Cardoso + Fixes #7710 + Closes #7711 + +- [Tatsuhiro Tsujikawa brought this change] + + ngtcp2: fix build with ngtcp2 and nghttp3 + + ngtcp2_conn_client_new and nghttp3_conn_client_new are now macros. + Check the wrapped functions instead. + + ngtcp2_stream_close callback now takes flags parameter. + + Closes #7709 + +- write-out.d: clarify size_download/upload + + They show the number of "body" bytes transfered. + Fixes #7702 + Closes #7706 + +- http2: Curl_http2_setup needs to init stream data in all invokes + + Thus function was written to avoid doing multiple connection data + initializations, which is fine, but since it also initiates stream + related data it is crucial that it doesn't skip those even if called + again for the same connection. Solved by moving the stream + initializations before the "doing-it-again" check. + + Reported-by: Inho Oh + Fixes #7630 + Closes #7692 + +- url: fix compiler warning in no-verbose builds + + Follow-up from 2f0bb864c12 + + Closes #7700 + +- non-ascii: fix build errors from strerror fix + + Follow-up to 2f0bb864c12 + + Closes #7697 + +- parse_args: redo the warnings for --remote-header-name combos + + ... to avoid the memory leak risk pointed out by scan-build. + + Follow-up from 7a3e981781d6c18a + + Closes #7698 + +- ngtcp2: adapt to new size defintions upstream + + Reviewed-by: Tatsuhiro Tsujikawa + Closes #7699 + +- rustls: add strerror.h include + + Follow-up to 2f0bb864c12 + +- docs: the security list is reached at security at curl.se now + + Also update the FAQ section a bit to encourage users to rather submit + security issues on hackerone than sending email. + + Closes #7689 + +Marc Hoersken (9 Sep 2021) +- runtests: add option -u to error on server unexpectedly alive + + Let's try to actually handle the server unexpectedly alive + case by first making them visible on CI builds as failures. + + This is needed to detect issues with killing of the test + servers completely including nested process chains with + multiple PIDs per test server (including bash and perl). + + On Windows/cygwin platforms this is especially helpful with + debugging PID mixups due to cygwin using its own PID space. + + Reviewed-by: Daniel Stenberg + Closes #7180 + +Daniel Stenberg (9 Sep 2021) +- opts docs: unify phrasing in NAME header + + - avoid writing "set ..." or "enable/disable ..." or "specify ..." + *All* options for curl_easy_setopt() are about setting or enabling + things and most of the existing options didn't use that way of + description. + + - start with lowercase letter, unless abbreviation. For consistency. + + - Some additional touch-ups + + Closes #7688 + +- strerror.h: remove the #include from files not using it + +- lib: don't use strerror() + + We have and provide Curl_strerror() internally for a reason: strerror() + is not necessarily thread-safe so we should always try to avoid it. + + Extended checksrc to warn for this, but feature the check disabled by + default and only enable it in lib/ + + Closes #7685 + +Daniel Gustafsson (8 Sep 2021) +- cirrus: Add FreeBSD 13.0 job and disable sanitizer build + + As alluded to the in the now removed comment, a 13.0 image became + available and is now ready to be used. + + The sanitizer builds were running on the 12.1 image which since has + been removed from the config, leaving the builds not running at all. + When enabled it turns out that they don't actually work due to very + long timeouts in executing the tests, so keep the disabled for now + but a bit more controlled. + + Closes #7592 + +Daniel Stenberg (8 Sep 2021) +- copyrights: update copyright year ranges + +- RELEASE-NOTES: synced + +- INTERNALS: c-ares has a new home: c-ares.org + +- docs: remove experimental mentions from HSTS and MQTT + + Reported-by: Jonathan Cardoso + Bug: https://github.com/curl/curl/pull/6700#issuecomment-913792863 + Closes #7681 + +- [Cao ZhenXiang brought this change] + + curl: add warning for incompatible parameters usage + + --continue-at - and --remote-header-name are known incompatible parameters + + Closes #7674 + +- [git-bruh brought this change] + + examples/*hiperfifo.c: fix calloc arguments to match function proto + + Closes #7678 + +- INTERNALS: bump c-ares requirement to 1.16.0 + + Since ba904db0705c93 we use ares_getaddrinfo, added in c-ares 1.16.0 + +- curl: stop retry if Retry-After: is longer than allowed + + If Retry-After: specifies a period that is longer than what fits within + --retry-max-time, then stop retrying immediately. + + Added test 366 to verify. + + Reported-by: Kari Pahula + Fixes #7675 + Closes #7676 + +- [Michał Antoniak brought this change] + + mbedtls: avoid using a large buffer on the stack + + Use dynamic memory allocation for the buffer used in checking "pinned + public key". The PUB_DER_MAX_BYTES parameter with default settings is + set to a value greater than 2kB. + + Co-authored-by: Daniel Stenberg + Closes #7586 + +- configure: make --disable-hsts work + + The AC_ARG_ENABLE() macro itself uses a variable called + 'enable_[option]', so when our script also used a variable with that + name for the purpose of storing what the user wants, it also + accidentally made it impossible to switch off the feature with + --disable-hsts. Fix this by renaming our variable. + + Reported-by: Michał Antoniak + Fixes #7669 + Closes #7672 + +Jay Satiro (5 Sep 2021) +- config.d: note that curlrc is used even when --config + + Bug: https://github.com/curl/curl/pull/7666#issuecomment-912214751 + Reported-by: Viktor Szakats + + Closes https://github.com/curl/curl/pull/7667 + +Daniel Stenberg (4 Sep 2021) +- RELEASE-NOTES: synced + +- test1173: check references to libcurl options + + ... that they refer to actual existing libcurl options. + + Reviewed-by: Daniel Gustafsson + Closes #7656 + +- CURLOPT_UNIX_SOCKET_PATH.3: remove nginx reference, add see also + + Closes #7656 + +- opt-docs: verify man page sections + order + + In every libcurl option man page there are now 8 mandatory sections that + must use the right name in the correct order and test 1173 verifies + this. Only 14 man pages needed adjustments. + + The sections and the order is as follows: + + - NAME + - SYNOPSIS + - DESCRIPTION + - PROTOCOLS + - EXAMPLE + - AVAILABILITY + - RETURN VALUE + - SEE ALSO + + Reviewed-by: Daniel Gustafsson + Closes #7656 + +- opt-docs: make sure all man pages have examples + + Extended manpage-syntax.pl (run by test 1173) to check that every man + page for a libcurl option has an EXAMPLE section that is more than two + lines. Then fixed all errors it found and added examples. + + Reviewed-by: Daniel Gustafsson + Closes #7656 + +- get.d: provide more useful examples + + Closes #7668 + +- page-header: add GOPHERS, simplify wording in the 1st para + + Closes #7665 + +- connect: get local port + ip also when reusing connections + + Regression. In d6a37c23a3c (7.75.0) we removed the duplicated storage + (connection + easy handle), so this info needs be extracted again even + for re-used connections. + + Add test 435 to verify + + Reported-by: Max Dymond + Fixes #7660 + Closes #7662 + +Marcel Raad (2 Sep 2021) +- multi: fix compiler warning with `CURL_DISABLE_WAKEUP` + + `use_wakeup` is unused in this case. + + Closes https://github.com/curl/curl/pull/7661 + +Daniel Stenberg (1 Sep 2021) +- tests: adjust the tftpd output to work with hyper mode + + By making them look less like http headers, the hyper mode "tweak" + doesn't interfere. + + Enable test 2002 and 2003 in hyper builds (and 1280 which is unrelated + but should be enabled). + + Closes #7658 + +Daniel Gustafsson (1 Sep 2021) +- [Gisle Vanem brought this change] + + openssl: annotate SSL3_MT_SUPPLEMENTAL_DATA + + This adds support for the previously unhandled supplemental data which + in -v output was printed like: + + TLSv1.2 (IN), TLS header, Unknown (23): + + These will now be printed with proper annotation: + + TLSv1.2 (OUT), TLS header, Supplemental data (23): + + Closes #7652 + Reviewed-by: Daniel Stenberg + +Daniel Stenberg (1 Sep 2021) +- curl.1: provide examples for each option + + The file format for each option now features a "Example:" header that + can provide one or more examples that get rendered appropriately in the + output. All options MUST have at least one example or gen.pl complains + at build-time. + + This fix also does a few other minor format and consistency cleanups. + + Closes #7654 + +- progress: make trspeed avoid floats + + and compiler warnings for data conversions. + + Reported-by: Michał Antoniak + Fixes #7645 + Closes #7653 + +- test365: verify response with chunked AND Content-Length headers + +- http: ignore content-length if any transfer-encoding is used + + Fixes #7643 + Closes #7649 + +- RELEASE-NOTES: synced + +- Revert "http2: skip immediate parsing of payload following protocol switch" + + This reverts commit 455a63c66f188598275e87d32de2c4e8e26b80cb. + + Reported-by: Tk Xiong + Fixes #7633 + Closes #7648 + +- KNOWN_BUGS: HTTP/3 doesn't support client certs + + Closes #7625 + +- mailing lists: move from cool.haxx.se to lists.haxx.se + +- http_proxy: only wait for writable socket while sending request + + Otherwise it would wait socket writability even after the entire CONNECT + request has sent and make curl basically busy-loop while waiting for a + response to come back. + + The previous fix attempt in #7484 (c27a70a591a4) was inadequate. + + Reported-by: zloi-user on github + Reported-by: Oleguer Llopart + Fixes #7589 + Closes #7647 + +- http: disallow >3-digit response codes + + Make the built-in HTTP parser behave similar to hyper and reject any + HTTP response using more than 3 digits for the response code. + + Updated test 1432 accordingly. + Enabled test 1432 in the hyper builds. + + Closes #7641 + +- [Tatsuhiro Tsujikawa brought this change] + + ngtcp2: stop buffering crypto data + + Stop buffering crypto data because libngtcp2 now buffers submitted + crypto data. + + Closes #7637 + +- test1280: CRLFify the response to please hyper + + Closes #7639 + +- tests: enable test 1129 for hyper builds + + Closes #7638 + +- curl: better error message when -O fails to get a good name + + Due to how this currently works internally, it needs a working initial + file name to store contents in, so it may still fail even with -J is + used (and thus accepting a name from content-disposition:) if the file + name part of the URL isn't "good enough". + + Fixes #7628 + Closes #7635 + +- curl_easy_setopt: tweak the string copy wording + + Reported-by: Yaobin Wen + Fixes #7632 + Closes #7634 + +- RELEASE-NOTES: synced + +- [Don J Olmstead brought this change] + + cmake: sync CURL_DISABLE options + + Adds the full listing of CURL_DISABLE options to the CMake build. Moves + all option code, except for CURL_DISABLE_OPENSSL_AUTO_LOA_CONFIG which + resides near OpenSSL configuration, to the same block of code. Also + sorts the options here and in the cmake config header. + + Additionally sorted the CURL-DISABLE listing and fixed the + CURL_DISABLE_POP3 option. + + Closes #7624 + +Jay Satiro (25 Aug 2021) +- KNOWN_BUGS: FTPS upload data loss with TLS 1.3 + + Bug: https://github.com/curl/curl/issues/6149 + Reported-by: Bylon2@users.noreply.github.com + + Closes https://github.com/curl/curl/pull/7623 + +Daniel Stenberg (24 Aug 2021) +- cmake: avoid poll() on macOS + + ... like we do in configure builds. Since poll() on macOS is not + reliable enough. + + Reported-by: marc-groundctl + Fixes #7595 + Closes #7619 + +- c-hyper: handle HTTP/1.1 => HTTP/1.0 downgrade on reused connection + + Enable test 1074 + + Closes #7617 + +- c-hyper: deal with Expect: 100-continue combined with POSTFIELDS + + Enable test 1130 and 1131 + + Closes #7616 + +- [a1346054 brought this change] + + tests: be explicit about using 'python3' instead of 'python' + + This fixes running tests in virtualenvs (or on distros) that no longer + have a symlink from python to python2 or python3. + + Closes #7602 + +- [a1346054 brought this change] + + scripts: invoke interpreters through /usr/bin/env + + Closes #7602 + +- DISABLED: enable 11 more tests for hyper builds + + Closes #7612 + +- setopt: enable CURLOPT_IGNORE_CONTENT_LENGTH for hyper + + Since this option is also used for FTP, it needs to work to set for + applications even if hyper doesn't support it for HTTP. Verified by test + 1137. + + Updated docs to specify that the option doesn't work for HTTP when using + the hyper backend. + + Closes #7614 + +- test1138: remove trailing space to make work with hyper + + Closes #7613 + +- libcurl-errors.3: clarify two CURLUcode errors + + CURLUE_BAD_HANDLE and CURLUE_BAD_PARTPOINTER should be for "bad" or + wrong pointers in a generic sense, not just for NULL pointers. + + Reviewed-by: Jay Satiro + + Ref: #7605 + Closes #7611 + +Jay Satiro (23 Aug 2021) +- symbols-in-versions: fix CURLSSLBACKEND_QSOSSL last used version + + ... and also change the 'Removed' column name to 'Last' since that + column is for the last version to contain the symbol. + + Closes https://github.com/curl/curl/pull/7609 + +Daniel Stenberg (23 Aug 2021) +- urlapi.c:seturl: assert URL instead of using if-check + + There's no code flow possible where this can happen. The assert makes + sure it also won't be introduced undetected in the future. + + Closes #7610 + +- curl-openssl.m4: show correct output for OpenSSL v3 + + Using 3.0.0 versions configure should now show this: + + checking for OpenSSL headers version... 3.0.0 - 0x300 + checking for OpenSSL library version... 3.0.0 + checking for OpenSSL headers and library versions matching... yes + + This output doesn't actually change what configure generates but is only + "cosmetic". + + Reported-by: Randall S. Becker + Fixes #7606 + Closes #7608 + +Jay Satiro (22 Aug 2021) +- mksymbolsmanpage.pl: Fix showing symbol's last used version + + Prior to this change the symbol's deprecated version was erroneously + shown as its last used version. + + Bug: https://github.com/curl/curl/commit/4e53b94#commitcomment-55239509 + Reported-by: i-ky@users.noreply.github.com + +Daniel Stenberg (21 Aug 2021) +- mksymbolsmanpage.pl: match symbols case insenitively + + Follow-up to 4e53b9430c750 which made this bug show. + + Reported-by: i-ky + Bug: https://github.com/curl/curl/commit/4e53b9430c7504de8984796e2a2091ec16f27136#commitcomment-55239253 + Closes #7607 + +- asyn-ares: call ares_freeaddrinfo() to clean up addrinfo results + + As this leaks memory otherwise + + Follow-up to ba904db0705c931 + + Closes #7599 + +- [Ehren Bendler brought this change] + + wolfssl: clean up wolfcrypt error queue + + If wolfSSL is built in certain ways (OPENSSL_EXTRA or Debug), the error + queue gets added on to for each session and never freed. Fix it by + calling ERR_clear_error() like in vtls/openssl when needed. This func is + a no-op in wolfcrypt if the error queue is not enabled. + + Closes #7594 + +- man pages: remove trailing whitespaces + + Extended test 1173 (via the manpage-syntax.pl script) to detect and warn + for them. + + Ref: #7602 + Reported-by: a1346054 on github + Closes #7604 + +- mailmap: add Gleb Ivanovsky + +- config.d: escape the backslash properly + + Closes #7603 + +- [Don J Olmstead brought this change] + + curl_setup.h: sync values for HTTP_ONLY + + The values for HTTP_ONLY differed between CMakeLists.txt and + curl_setup.h. Sync them and sort the values in curl_setup.h to make it + easier to spot differences. + + Closes #7601 + +Jay Satiro (21 Aug 2021) +- configure: set classic mingw minimum OS version to XP + + - If the user has not specified a minimum OS version (via WINVER or + _WIN32_WINNT macros) then set it to Windows XP. + + Prior to this change classic MinGW defaulted the minimum OS version + to Windows NT 4.0 which is way too old. At least Windows XP is needed + for getaddrinfo (which resolves hostnames to IPv6 addresses). + + Ref: https://github.com/curl/curl/issues/7483#issuecomment-891597034 + + Closes https://github.com/curl/curl/pull/7581 + +- schannel: Work around typo in classic mingw macro + + - Define ALG_CLASS_DHASH (the typo from the include) to ALG_CLASS_HASH. + + Prior to this change there was an incomplete fix to ignore the + CALG_TLS1PRF macro on those versions of MinGW where it uses the + ALG_CLASS_DHASH typoed macro. + + Ref: 48cf45c + Ref: https://osdn.net/projects/mingw/ticket/38391 + Ref: https://github.com/curl/curl/issues/2924 + + Closes https://github.com/curl/curl/pull/7580 + +Daniel Stenberg (20 Aug 2021) +- RELEASE-NOTES: synced + +- http_proxy: fix user-agent and custom headers for CONNECT with hyper + + Enable test 287 + + Closes #7598 + +- c-hyper: initial support for "dumping" 1xx HTTP responses + + With the use hyper_request_on_informational() + + Enable test 155 and 158 + + Closes #7597 + +Marc Hoersken (18 Aug 2021) +- tests/*server.pl: flush output before executing subprocess + + Also avoid shell processes staying around by using exec. + This is necessary to avoid output data being buffering + inside the process chain of Perl, Bash/Shell and our + test server binaries. On non-Windows systems the exec + will also make the subprocess replace the intermediate + shell, but on Windows it will at least bind the processes + together since there is no real fork or exec available. + + See: https://cygwin.com/cygwin-ug-net/highlights.html + and: https://docs.microsoft.com/cpp/c-runtime-library/exec-wexec-functions + Ref: https://github.com/curl/curl/pull/7530#issuecomment-900949010 + + Reviewed-by: Daniel Stenberg + Reviewed-by: Jay Satiro + Closes #7530 + +- CI: use GitHub Container Registry instead of Docker Hub + + Avoid limits on Docker Hub and improve image pull/download speed. + + Closes #7587 + +Daniel Stenberg (18 Aug 2021) +- openssl: when creating a new context, there cannot be an old one + + Remove the previous handling that would call SSL_CTX_free(), and instead + add an assert that halts a debug build if there ever is a context + already set at this point. + + Closes #7585 + +Jay Satiro (18 Aug 2021) +- KNOWN_BUGS: Renegotiate from server may cause hang for OpenSSL backend + + Closes https://github.com/curl/curl/issues/6785 + +Viktor Szakats (17 Aug 2021) +- docs/BINDINGS: URL update + +Marc Hoersken (17 Aug 2021) +- tests/server/*.c: align handling of portfile argument and file + + 1. Call the internal variable portname (like pidname) everywhere. + 2. Have a variable wroteportfile (like wrotepidfile) everywhere. + 3. Make sure the file is cleaned up on exit (like pidfile). + 4. Add parameter --portfile to usage outputs everywhere. + + Reviewed-by: Daniel Stenberg + + Replaces #7523 + Closes #7574 + +Daniel Gustafsson (17 Aug 2021) +- KNOWN_BUGS: Fix a number of typos in KNOWN_BUGS + + Fixes a set of typos found in section 11.3. + +Daniel Stenberg (17 Aug 2021) +- getparameter: fix the --local-port number parser + + It could previously get tricked into parsing the uninitialized stack + based buffer. + + Reported-by: Brian Carpenter + Closes #7582 + +- KNOWN_BUGS: Can't use Secure Transport with Crypto Token Kit + + Closes #7048 + +- [Jan Verbeek brought this change] + + curl: add warning for ignored data after quoted form parameter + + In an argument like `-F 'x=@/etc/hostname;filename="foo"abc'` the `abc` + is ignored. This adds a warning if the ignored data isn't all + whitespace. + + Closes #7394 + +Jay Satiro (17 Aug 2021) +- codeql: fix error "Resource not accessible by integration" + + - Enable codeql writing security-events. + + GitHub set the default permissions to read, apparently since earlier + this year. + + Ref: https://github.com/github/codeql-action/issues/464 + Ref: https://github.blog/changelog/2021-04-20-github-actions-control-permissions-for-github_token/ + + Fixes https://github.com/curl/curl/issues/7575 + Closes https://github.com/curl/curl/pull/7576 + +- tool_operate: Fix --fail-early with parallel transfers + + - Abort via progress callback to fail early during parallel transfers. + + When a critical error occurs during a transfer (eg --fail-early + constraint) then other running transfers will be aborted via progress + callback and finish with error CURLE_ABORTED_BY_CALLBACK (42). In this + case, the callback error does not become the most recent error and a + custom error message is used for those transfers: + + curld --fail --fail-early --parallel + https://httpbin.org/status/404 https://httpbin.org/delay/10 + + curl: (22) The requested URL returned error: 404 + curl: (42) Transfer aborted due to critical error in another transfer + + > echo %ERRORLEVEL% + 22 + + Fixes https://github.com/curl/curl/issues/6939 + Closes https://github.com/curl/curl/pull/6984 + +Daniel Stenberg (17 Aug 2021) +- [Sergey Markelov brought this change] + + sectransp: support CURLINFO_CERTINFO + + Fixes #4130 + Closes #7372 + +- ngtcp2: remove the acked_crypto_offset struct field init + + ... as it is gone from the API upstream. + + Closes #7578 + +- misc: update incorrect copyright year ranges + + Closes #7577 + +- KNOWN_BUGS: HTTP/3 quiche upload large file fails + + Closes #7532 + +- KNOWN_BUGS: CMake build with MIT Kerberos does not work + + Closes #6904 + +- TODO: add asynch getaddrinfo support + + Closes #6746 + +- RELEASE-NOTES: synced + +- [Artur Sinila brought this change] + + http2: revert call the handle-closed function correctly on closed stream + + Reverts 252790c5335a221 + + Assisted-by: Gergely Nagy + Fixes #7400 + Closes #7525 + +- [Patrick Monnerat brought this change] + + auth: do not append zero-terminator to authorisation id in kerberos + + RFC4752 Section 3.1 states "The authorization identity is not terminated + with a zero-valued (%x00) octet". Although a comment in code said it may + be needed anyway, nothing confirms it. In addition, servers may consider + it as part of the identity, causing a failure. + + Closes #7008 + +- [Patrick Monnerat brought this change] + + auth: use sasl authzid option in kerberos + + ... instead of deriving it from active ticket. + Closes #7008 + +- [Patrick Monnerat brought this change] + + auth: we do not support a security layer after kerberos authentication + + Closes #7008 + +- [Patrick Monnerat brought this change] + + auth: properly handle byte order in kerberos security message + + Closes #7008 + +- [z2_ brought this change] + + x509asn1: fix heap over-read when parsing x509 certificates + + Assisted-by: Patrick Monnerat + Closes #7536 + +- KNOWN_BUGS: Disconnects don't do verbose + + Closes #6995 + +- mailmap: fixup Michał Antoniak + +- [Michał Antoniak brought this change] + + build: fix compiler warnings + + For when CURL_DISABLE_VERBOSE_STRINGS and DEBUGBUILD flags are both + active. + + - socks.c : warning C4100: 'lineno': unreferenced formal parameter + (co-authored by Daniel Stenberg) + + - mbedtls.c: warning C4189: 'port': local variable is initialized but + not referenced + + - schannel.c: warning C4189: 'hostname': local variable is initialized + but not referenced + + Cloes #7528 + +- [Gleb Ivanovsky brought this change] + + CODE_STYLE-md: fix bold font style + + Markdown gets confused with abundance of asterisks, so use underscores + instead. + + Reviewed-by: Daniel Gustafsson + Closes #7569 + +- [Gleb Ivanovsky brought this change] + + CODE_STYLE-md: add missing comma + + Reviewed-by: Daniel Gustafsson + Closes #7570 + +- [Daniel Gustafsson brought this change] + + examples/ephiperfifo.c: simplify signal handler + + The signal handler registered for SIGINT is only handling SIGINT + so there isn't much need for inspecting the signo. While there, + rename the handler to be more specific. + + g_should_exit should really be of sig_atomic_t type, but relying + on autoconf in the examples seems like a bad idea so keep that + for now. + + Reviewed-by: Daniel Stenberg + Closes #7310 + +- c-hyper: initial step for 100-continue support + + Enabled test 154 + + Closes #7568 + +- [Ikko Ashimine brought this change] + + vtls: fix typo in schannel_verify.c + + occurence -> occurrence + + Closes #7566 + +- [Emil Engler brought this change] + + curl_url_get.3: clarify about path and query + + The current man-page lacks some details regarding the obtained path and + query. + + Closes #7563 + +- c-hyper: fix header value passed to debug callback + + Closes #7567 + +Viktor Szakats (12 Aug 2021) +- cleanup: URL updates + + - replace broken URL with the one it was most probably pointing to + when added (lib/tftp.c) + - replace broken URL with archive.org link (lib/curl_ntlm_wb.c) + - delete unnecessary protocol designator from archive.org URL + (docs/BINDINGS.md) + + Closes #7562 + +Daniel Stenberg (12 Aug 2021) +- [April King brought this change] + + DEPRECATE.md: linkify curl-library mailing list + + Closes #7561 + +- [Barry Pollard brought this change] + + output.d: add method to suppress response bodies + + Closes #7560 + +- TODO: remove 'c-ares deviates on http://1346569778' + + Fixed since 56a037cc0ad1b2 (7.77.0) + +- [Colin O'Dell brought this change] + + BINDINGS.md: update links to use https where available + + Closes #7558 + +- asyn-ares.c: move all version number checks to the top + + ... and use #ifdef [feature] in the code as per our guidelines. + +- ares: use ares_getaddrinfo() + + ares_getaddrinfo() is the getaddrinfo() cloned provided by c-ares, introduced + in version 1.16.0. + + With older c-ares versions, curl invokes ares_gethostbyname() twice - once for + IPv4 and once for IPv6 to resolve both addresses, and then combines the + returned results. + + Reported-by: jjandesmet + Fixes #7364 + Closes #7552 + +- [Tatsuhiro Tsujikawa brought this change] + + ngtcp2: utilize crypto API functions to simplify + + Closes #7551 + +- [megatronking brought this change] + + ngtcp2: reset the oustanding send buffer again when drained + + Closes #7538 + +Michael Kaufmann (10 Aug 2021) +- progress: fix a compile warning on some systems + + lib/progress.c:380:40: warning: conversion to 'long double' from + 'curl_off_t {aka long long int}' may alter its value [-Wconversion] + + Closes #7549 + +Daniel Stenberg (10 Aug 2021) +- RELEASE-NOTES: synced + +- http: consider cookies over localhost to be secure + + Updated test31. + Added test 392 to verify secure cookies used for http://localhost + + Reviewed-by: Daniel Gustafsson + Fixes #6733 + Closes #7263 + +- TODO: erase secrets from heap/stack after use + + Closes #7268 + +Jay Satiro (10 Aug 2021) +- hostip: Make Curl_ipv6works function independent of getaddrinfo + + - Do not assume IPv6 is not working when getaddrinfo is not present. + + The check to see if IPv6 actually works is now independent of whether + there is any resolver that can potentially resolve a hostname to IPv6. + + Prior to this change if getaddrinfo() was not found at compile time then + Curl_ipv6works() would be defined as a macro that returns FALSE. + + When getaddrinfo is not found then libcurl is built with CURLRES_IPV4 + defined instead of CURLRES_IPV6, meaning that it cannot do IPv6 lookups + in the traditional way. With this commit if libcurl is built with IPv6 + support (ENABLE_IPV6) but without getaddrinfo (CURLRES_IPV6), and the + IPv6 stack is actually working, then it is possible for libcurl to + resolve IPv6 addresses by using DoH. + + Ref: https://github.com/curl/curl/issues/7483#issuecomment-890765378 + + Closes https://github.com/curl/curl/pull/7529 + +- test1565: fix windows build errors + + - Use our wait_ms() instead of sleep() since Windows doesn't have the + latter. + + - Use a separate variable to keep track of whether the pthread_t thread + id is valid. + + On Windows pthread_t is not an integer type. pthread offers no macro for + invalid pthread_t thread id, so validity is kept track of separately. + + Closes https://github.com/curl/curl/pull/7527 + +- [Jeremy Falcon brought this change] + + winbuild/README.md: clarify GEN_PDB option + + - Document that GEN_PDB option creates an external database. + + Ref: https://github.com/curl/curl/issues/7502 + +Daniel Stenberg (9 Aug 2021) +- [Tatsuhiro Tsujikawa brought this change] + + ngtcp2: replace deprecated functions with nghttp3_conn_shutdown_stream_read + + Closes #7546 + +- [Tatsuhiro Tsujikawa brought this change] + + ngtcp2: rework the return value handling of ngtcp2_conn_writev_stream + + Rework the return value handling of ngtcp2_conn_writev_stream and treat + NGTCP2_ERR_STREAM_SHUT_WR separately. + + Closes #7546 + +- configure: error out if both ngtcp2 and quiche are specified + + Reported-by: Vincent Grande + See #7539 + Closes #7545 + +- [Jeff Mears brought this change] + + easy: use a custom implementation of wcsdup on Windows + + ... so that malloc/free overrides from curl_global_init are used for + wcsdup correctly. + + Closes #7540 + +- zuul: add an mbedtls3 CI job + + Closes #7544 + +- [Benau brought this change] + + mbedTLS: initial 3.0.0 support + + Closes #7428 + +- RELEASE-NOTES: synced + +- configure.ac: revert bad nghttp2 library detection improvements + + This reverts commit b4b34db65f9f8, 673753344c5f and 29c7cf79e8b. + + The logic is now back to assuming that the nghttp2 lib is called nghttp2 and + nothing else. + + Reported-by: Rui Pinheiro + Reported-by: Alex Crichton + Fixes #7514 + Closes #7515 + +- happy-eyeballs-timeout-ms.d: polish the wording + + Reported-by: Josh Soref + Fixes #7433 + Closes #7542 + +- [modbw brought this change] + + mbedtls_threadlock: fix unused variable warning + + Closes #7393 + +- [Tatsuhiro Tsujikawa brought this change] + + ngtcp2: compile with the latest ngtcp2 and nghttp3 + + Closes #7541 + +Marc Hoersken (31 Jul 2021) +- CI/cirrus: reduce compile time with increased parallism + + Cirrus CI VMs have 2 CPUs, let's use them also for Windows builds. + + Reviewed-by: Daniel Stenberg + Closes #7505 + +Daniel Stenberg (30 Jul 2021) +- [Bin Lan brought this change] + + tool/tests: fix potential year 2038 issues + + The length of 'long' in a 32-bit system is 32 bits, which cannot be used + to save timestamps after 2038. Most operating systems have extended + time_t to 64 bits. + + Remove the castings to long. + + Closes #7466 + +- compressed.d: it's a request, not an order + + Clarified + + Reported-by: Dan Jacobson + Reviewed-by: Daniel Gustafsson + Fixes #7516 + Closes #7517 + +- [Bernhard M. Wiedemann brought this change] + + tests: make three tests pass until 2037 + + after 2038 something in test1915 fails on 32-bit OSes + + Closes #7512 + +Daniel Gustafsson (30 Jul 2021) +- connect: remove superfluous conditional + + Commit dbd16c3e2 cleaned up the logic for traversing the addrinfos, + but the move left a conditional on ai which no longer is needed as + the while loop reevaluation will cover it. + + Closes #7511 + Reviewed-by: Carlo Marcelo Arenas Belón + Reviewed-by: Daniel Stenberg + +Daniel Stenberg (29 Jul 2021) +- RELEASE-NOTES: synced + + and bump curlver to 7.79.0 for next release + +Marc Hoersken (29 Jul 2021) +- tests/*server.py: remove pidfile on server termination + + Avoid pidfile leaking/laying around after server already exited. + + Reviewed-by: Daniel Stenberg + Closes #7506 + +Daniel Gustafsson (27 Jul 2021) +- tool_main: fix typo in comment + + The referred to library is NSPR, so fix the switched around characters. + +Daniel Stenberg (28 Jul 2021) +- [Aleksandr Krotov brought this change] + + bearssl: support CURLOPT_CAINFO_BLOB + + Closes #7468 + +- curl.1: mention "global" flags + + Mention options that are "global". A global command line option is one + that doesn't get reset at --next uses and therefore don't need to be + used again. + + Reported-by: Josh Soref + + Fixes #7457 + Closes #7510 + +- CURLOPT_DOH_URL.3: CURLOPT_OPENSOCKETFUNCTION is not inherited + + Reported-by: Daniel Woelfel + Fixes #7441 + Closes #7509 + +- KNOWN_BUGS: add more HTTP/3 problems + + Closes #7351 + Closes #7339 + Closes #7125 + +Marc Hoersken (27 Jul 2021) +- CI/azure: reduce compile time with increased parallism + + Azure Pipelines CI VMs have 2 CPUs, let's use them. + + Closes #7489 + +Jay Satiro (27 Jul 2021) +- [Josh Soref brought this change] + + docs: fix grammar + + Fixes https://github.com/curl/curl/issues/7444 + Fixes https://github.com/curl/curl/issues/7451 + Fixes https://github.com/curl/curl/issues/7465 + Closes https://github.com/curl/curl/pull/7495 + +- mail-rcpt.d: fix grammar + + Remove confusing sentence that says to specify an e-mail address for + mail transfer, since that's implied. + + Reported-by: Josh Soref + + Fixes https://github.com/curl/curl/issues/7452 + Closes https://github.com/curl/curl/pull/7495 + +Daniel Stenberg (27 Jul 2021) +- c-hyper: remove the hyper_executor_poll() loop from Curl_http + + 1. it's superfluous + 2. it didn't work identically to the Curl_hyper_stream one which could + cause problems like #7486 + + Pointed-out-by: David Cook + Closes #7499 + +- curl-openssl.m4: check lib64 for the pkg-config file + + OpenSSL recently started putting the libs in $prefix/lib64 on 'make + install', so we check that directory for pkg-config data if the 'lib' + check fails. + + Closes #7503 + +- CURLOPT_SSL_CTX_*.3: tidy up the example + + Use the proper code style. Don't store return codes that aren't read. + Copy the same example into CURLOPT_SSL_CTX_FUNCTION.3 as well. + + Closes #7500 + +- example/cookie_interface: fix scan-build printf warning + + Follow-up to 4b79c4fb565 + + Fixes #7497 + Closes #7498 + +- [Josh Soref brought this change] + + limit-rate.d: clarify base unit + + Fixes #7439 + Closes #7494 + +- [Carlo Marcelo Arenas Belón brought this change] + + examples/cookie_interface: avoid printfing time_t directly + + time_t representation is undefined and varies on bitsize and signedness, + and as of C11 could be even non integer. + + instead of casting to unsigned long (which would truncate in systems + with a 32bit long after 2106) use difftime to get the elapsed time as a + double and print that (without decimals) instead. + + alternatively a cast to curl_off_t and its corresponding print + formatting could have been used (at least in POSIX) but portability and + curl agnostic code was prioritized. + + Closes #7490 + +Marc Hoersken (25 Jul 2021) +- tests/servers: remove obsolete pid variable + + Variable is not used since pidfile handling moved to util.[ch] + + Reviewed-by: Jay Satiro + Closes #7482 + +- tests/servers: use our platform-aware pid for server verification + + The pid used for server verification is later stored as pid2 in + the hash of running test servers and therefore used for shutdown. + + The pid used for shutdown must be the platform-aware (Win32) pid + to avoid leaking test servers while running them using Cygwin/msys. + + Reviewed-by: Jay Satiro + Closes #7481 + +- tests/runtests.pl: cleanup copy&paste mistakes and unused code + + Reviewed-by: Jay Satiro + Part of #7481 + +Daniel Stenberg (25 Jul 2021) +- RELEASE-NOTES: synced + + bumped to 7.78.1 for next release + +- http_proxy: clear 'sending' when the outgoing request is sent + + ... so that Curl_connect_getsock() will know how to wait for the socket + to become readable and not writable after the entire CONNECT request has + been issued. + + Regression added in 7.77.0 + + Reported-by: zloi-user on github + Assisted-by: Jay Satiro + Fixes #7155 + Closes #7484 + +Jay Satiro (25 Jul 2021) +- [Josh Soref brought this change] + + openssl: fix grammar + + Closes https://github.com/curl/curl/pull/7480 + +- configure.ac: tweak nghttp2 library name fix again + + - Change extraction to handle multiple library names returned by + pkg-config (eg a possible scenario with pkg-config --static). + + Ref: https://github.com/curl/curl/pull/7472 + + Closes https://github.com/curl/curl/pull/7485 + +Dan Fandrich (23 Jul 2021) +- Get rid of the unused HAVE_SIG_ATOMIC_T et. al. + + It was added in 2006 but I see no evidence it was ever used. + +Jay Satiro (23 Jul 2021) +- docs: change max-filesize caveat again + + - Add protocols field to max-filesize.d. + + - Revert wording on unknown file size caveat and do not discuss specific + protocols in that section. + + Partial revert of ecf0225. All max-filesize options now have the list of + protocols and it's clearer just to have that list without discussing + specific protocols in the caveat. + + Reported-by: Josh Soref + + Ref: https://github.com/curl/curl/issues/7453#issuecomment-884128762 + +Daniel Stenberg (22 Jul 2021) +- [Christian Weisgerber brought this change] + + configure: tweak nghttp2 library name fix + + commit 29c7cf79e8b44cf (shipped in 7.78.0) introduced a problem by + assuming that LIB_H2 does not have any leading whitespace. At least + OpenBSD's native pkg-config can produce such whitespace, though: + + $ pkg-config --libs-only-l libnghttp2 + -lnghttp2 + + As a result, the configure check for libnghttp2 will erroneously fail. + + Bug: https://curl.se/mail/lib-2021-07/0050.html + Closes #7472 + +- [Bastian Krause brought this change] + + docs/MQTT: update state of username/password support + + PR #7243 implemented username/password support for MQTT, so let's drop + these items from the caveats. + + Signed-off-by: Bastian Krause + + Closes #7474 + +- [Oleg Pudeyev brought this change] + + CURLMOPT_TIMERFUNCTION.3: remove misplaced "time" + + Closes #7470 + +Version 7.78.0 (21 Jul 2021) + +Daniel Stenberg (21 Jul 2021) +- RELEASE-NOTES: synced + + curl 7.78.0 release + +- winbuild/MakefileBuild.vc: bump copyright year + +Jay Satiro (21 Jul 2021) +- docs: mention max-filesize options also apply to MQTT transfers + + Also make it clearer that the caveat 'if the file size is unknown it + the option will have no effect' may apply to protocols other than FTP + and HTTP. + + Reported-by: Josh Soref + + Fixes https://github.com/curl/curl/issues/7453 + +- [Josh Soref brought this change] + + docs/cmdline: fix grammar and typos + +- [Josh Soref brought this change] + + dump-header.d: Drop suggestion to use for cookie storage + + Since --cookie-jar is the preferred way to store cookies, no longer + suggest using --dump-header to do so. + + Co-authored-by: Daniel Stenberg + + Closes https://github.com/curl/curl/issues/7414 + +- [Josh Soref brought this change] + + doc/cmdline: fix grammar and typos + + Closes https://github.com/curl/curl/pull/7454 + Closes https://github.com/curl/curl/pull/7455 + Closes https://github.com/curl/curl/pull/7456 + Closes https://github.com/curl/curl/pull/7459 + Closes https://github.com/curl/curl/pull/7460 + Closes https://github.com/curl/curl/pull/7461 + Closes https://github.com/curl/curl/pull/7462 + Closes https://github.com/curl/curl/pull/7463 + +Daniel Stenberg (20 Jul 2021) +- vtls: fix connection reuse checks for issuer cert and case sensitivity + + CVE-2021-22924 + + Reported-by: Harry Sintonen + Bug: https://curl.se/docs/CVE-2021-22924.html + +- sectransp: check for client certs by name first, then file + + CVE-2021-22926 + + Bug: https://curl.se/docs/CVE-2021-22926.html + + Assisted-by: Daniel Gustafsson + Reported-by: Harry Sintonen + +- telnet: fix option parser to not send uninitialized contents + + CVS-2021-22925 + + Reported-by: Red Hat Product Security + Bug: https://curl.se/docs/CVE-2021-22925.html + +Jay Satiro (20 Jul 2021) +- connect: fix wrong format specifier in connect error string + + 0842175 (not in any release) used the wrong format specifier (long int) + for timediff_t. On an OS such as Windows libcurl's timediff_t (usually + 64-bit) is bigger than long int (32-bit). In 32-bit Windows builds the + upper 32-bits of the timediff_t were erroneously then used by the next + format specifier. Usually since the timeout isn't larger than 32-bits + this would result in null as a pointer to the string with the reason for + the connection failing. On other OSes or maybe other compilers it could + probably result in garbage values (ie crash on deref). + + Before: + Failed to connect to localhost port 12345 after 1201 ms: (nil) + + After: + Failed to connect to localhost port 12345 after 1203 ms: Connection refused + + Closes https://github.com/curl/curl/pull/7449 + +- winbuild: support alternate nghttp2 static lib name + + - Support both nghttp2.lib and nghttp2_static.lib for static nghttp2. + + nghttp2 briefly changed its static lib name to nghttp2_static, but then + made the _static suffix optional. + + Ref: https://github.com/nghttp2/nghttp2/pull/1394 + Ref: https://github.com/nghttp2/nghttp2/pull/1418 + Ref: https://github.com/nghttp2/nghttp2/issues/1466 + + Reported-by: Pierre Yager + + Fixes https://github.com/curl/curl/issues/7446 + Closes https://github.com/curl/curl/pull/7447 + +- [Josh Soref brought this change] + + docs/cmdline: fix grammar and typos + + Closes https://github.com/curl/curl/pull/7432 + Closes https://github.com/curl/curl/pull/7436 + Closes https://github.com/curl/curl/pull/7438 + Closes https://github.com/curl/curl/pull/7440 + Closes https://github.com/curl/curl/pull/7445 + +- [Josh Soref brought this change] + + delegation.d: mention what happens when used multiple times + + Closes https://github.com/curl/curl/pull/7408 + +- [Josh Soref brought this change] + + create-file-mode.d: mention what happens when used multiple times + + Closes https://github.com/curl/curl/pull/7407 + +- [Josh Soref brought this change] + + config.d: split comments and option-per line + + Closes https://github.com/curl/curl/pull/7405 + +Daniel Stenberg (19 Jul 2021) +- misc: copyright year range updates + +- mailmap: add Tobias and Timur + +Daniel Gustafsson (18 Jul 2021) +- [Josh Soref brought this change] + + docs: spell out directories instead of dirs in create-dirs + + Write out directories rather than using the dirs abbrevation. Also + use plural form consistently, even if the code in the end might just + create a single directory. + + Closes #7406 + Reviewed-by: Daniel Stenberg + Reviewed-by: Daniel Gustafsson + +- [Tobias Nyholm brought this change] + + docs: correct spelling errors and a broken link + + Update grammar and spelling in docs and source code comments. + + Closes: #7427 + Reviewed-by: Daniel Stenberg + +Marc Hoersken (18 Jul 2021) +- CI/cirrus: install impacket from PyPI instead of FreeBSD packages + + Availability of impacket as FreeBSD package is too flaky. + + Stick to legacy version of cryptography which still + supports OpenSSL version 1.0.2 due to FreeBSD 11. + + Reviewed-by: Daniel Stenberg + + Closes #7418 + +Daniel Stenberg (18 Jul 2021) +- [Josh Soref brought this change] + + docs/cmdline: mention what happens when used multiple times + + For --dns-ipv4-addr, --dns-ipv6-addr and --dns-servers + + Closes #7410 + Closes #7411 + Closes #7412 + +- [Michał Antoniak brought this change] + + lib: fix compiler warnings with CURL_DISABLE_NETRC + + warning C4189: 'netrc_user_changed': local variable is initialized but + not referenced + + warning C4189: 'netrc_passwd_changed': local variable is initialized but + not referenced + + Closes #7423 + +- disable-epsv.d: remove duplicate "(FTP)" + + ... since the tooling adds that to the output based on the "Protocols:" + tag. + +- [Max Zettlmeißl brought this change] + + docs: make the documentation for --etag-save match the program behaviour + + When using curl with the option `--etag-save` I expected it to save the + ETag without its surrounding quotes, as stated by the documentation in + the repository and by the generated man pages. + + My first endeavour was to fix the program, but while investigating the + history of the relevant parts, I discovered that curl once saved the + ETag without the quotes. This was undone by Daniel Stenberg in commit + `98c94596f5928840177b6bd3c7b0f0dd03a431af`, therefore I decided that in + this case the documentation should be adjusted to match the behaviour of + curl. + + The changed save behaviour also made parts of the `--etag-compare` + documentation wrong or superfluous, so I adjusted those accordingly. + + Closes #7429 + +- [Josh Soref brought this change] + + write-out.d: add missing periods + + Closes #7404 + +- [Josie Huddleston brought this change] + + easy: during upkeep, attach Curl_easy to connections in the cache + + During the protocol-specific parts of connection upkeep, some code + assumes that the data->conn pointer already is set correctly. However, + there's currently no guarantee of that in the code. + + This fix temporarily attaches each connection to the Curl_easy object + before performing the protocol-specific connection check on it, in a + similar manner to the connection checking in extract_if_dead(). + + Fixes #7386 + Closes #7387 + Reported-by: Josie Huddleston + +- [Josh Soref brought this change] + + cleanup: spell DoH with a lowercase o + + Signed-off-by: Josh Soref + + Closes #7413 + +- [Josh Soref brought this change] + + TheArtOfHttpScripting: polish + + - add missing backticks and comma + + - fix proxy description: + + * example proxy isn't local + * locally doesn't really make sense + + Closes #7416 + +- [Josh Soref brought this change] + + form.d: add examples of `,`/`;` for file[name] + + Fixes #7415 + Closes #7417 + +- [Michał Antoniak brought this change] + + mbedtls: Remove unnecessary include + + - curl_setup.h: all references to mbedtls_md4* functions and structures + are in the md4.c. This file already includes the file + along with the file existence control (defined (MBEDTLS_MD4_C)) + + - curl_ntlm_core.c: unnecessary include - repeated below + + Closes #7419 + +- RELEASE-NOTES: synced + +Jay Satiro (16 Jul 2021) +- [User Sg brought this change] + + multi: fix crash in curl_multi_wait / curl_multi_poll + + Appears to have been caused by 51c0ebc (precedes 7.77.0) which added a + VALID_SOCK check to one of the loops through the sockets but not the + other. + + Reported-by: sylgal@users.noreply.github.com + Authored-by: sylgal@users.noreply.github.com + + Fixes https://github.com/curl/curl/issues/7379 + Closes https://github.com/curl/curl/pull/7389 + +- [Daniel Gustafsson brought this change] + + tool_help: remove unused define + + The PRINT_LINES_PAUSE macro is no longer used, and has been mostly + cleaned out but one occurrence remained. + + Closes https://github.com/curl/curl/pull/7380 + +- [Sergey Markelov brought this change] + + build: fix compiler warnings when CURL_DISABLE_VERBOSE_STRINGS + + fix compiler warnings about unused variables and parameters when + built with --disable-verbose. + + Closes https://github.com/curl/curl/pull/7377 + +- [Andrea Pappacoda brought this change] + + build: fix IoctlSocket FIONBIO check + + Prior to this change HAVE_IOCTLSOCKET_CAMEL_FIONBIO mistakenly checked + for (lowercase) ioctlsocket when it should have checked for IoctlSocket. + + Closes https://github.com/curl/curl/pull/7375 + +- [Timur Artikov brought this change] + + configure: fix nghttp2 library name for static builds + + Don't hardcode the nghttp2 library name, + because it can vary, be "nghttp2_static" for example. + + Fixes https://github.com/curl/curl/issues/7367 + Closes https://github.com/curl/curl/pull/7368 + +Gisle Vanem (16 Jul 2021) +- [PellesC] fix _lseeki64() macro + +- [SChannel] Use '_tcsncmp()' instead + + Revert previous change for PellesC. + + Instead replace all use of `_tcsnccmp()` with `_tcsncmp()`. + +- [PellesC] missing '_tcsnccmp' + + PellesC compiler does not have this macro in it's `` + +Daniel Gustafsson (14 Jul 2021) +- TODO: add mention of mbedTLS 3 incompatibilities + + Wyatt OʼDay reported in #7385 that mbedTLS isn't backwards compatible + and curl no longer builds with it. Document the need to fix our support + until so has been done. + + Closes #7390 + Fixes #7385 + Reported-by: Wyatt OʼDay + Reviewed-by: Jay Satiro + +- docs: fix inconsistencies in EGDSOCKET documentation + + Only the OpenSSL backend actually use the EGDSOCKET, and also use + TLS consistently rather than mixing SSL and TLS. While there, also + fix a minor spelling nit. + + Closes: #7391 + Reviewed-by: Jay Satiro + +- [Борис Верховский brought this change] + + docs: document missing arguments to commands + + This is a followup to commit f410b9e538129e77607fef1 fixing a few + more commands which takes arguments. + + Closes #7382 + Reviewed-by: Daniel Gustafsson + +- [Randolf J brought this change] + + docs: fix incorrect argument name reference + + The documentation for the read callback was erroneously referencing + the nitems argument by nmemb. The error was introduced in commit + ce0881edee3c7. + + Closes #7383 + Reviewed-by: Daniel Gustafsson + +- [Борис Верховский brought this change] + + tool_help: Document that --tlspassword takes a password + + Closes #7378 + Reviewed-by: Daniel Stenberg + +- scripts: Fix typo in release-notes instructions + + The command to run had a typo in the pathname which prevented copy + pasting it to work, which has annoyed me enough to fix this now. + +- RELEASE-NOTES: synced + +Jay Satiro (10 Jul 2021) +- write-out.d: Clarify urlnum is not unique for de-globbed URLs + + Reported-by: Коваленко Анатолий Викторович + + Fixes https://github.com/curl/curl/issues/7342 + Closes https://github.com/curl/curl/pull/7369 + +Daniel Gustafsson (3 Jul 2021) +- [William Desportes brought this change] + + docs: Fix typos + + Closes: #7370 + Reviewed-by: Daniel Gustafsson + +Daniel Stenberg (8 Jul 2021) +- [Jonathan Wernberg brought this change] + + Revert "ftp: Expression 'ftpc->wait_data_conn' is always false" + + The reverted commit introduced a logic error in code that was + correct. + + The client using libcurl would notice the error since FTP file + uploads in active transfer mode would somtimes complete with + success despite no transfer having been performed and the + "uploaded" file thus not being on the remote server afterwards. + + The FTP server would notice the error because it receives a + RST on the data connection it has established with the client + before any data was transferred at all. + + The logic error happens if the STOR response from the server have + arrived by the time ftp_multi_statemach() in the affected code path + is called, but the incoming data connection have not arrived yet. + In that case, the processing of the STOR response will cause + 'ftpc->wait_data_conn' to be set to TRUE, contradicting the comment + in the code. Since 'complete' will also be set, later logic would + believe the transfer was done. + + In most cases, the STOR response will not have arrived yet when + the affected code path is executed, or the incoming connection will + also have arrived, and thus the error would not express itself. + But if the speed difference of the device using libcurl and the + FTP server is exactly right, the error may happen as often as in + one out of hundred file transfers. + + This reverts commit 49f3117a238b6eac0e22a32f50699a9eddcb66ab. + + Bug: https://curl.se/mail/lib-2021-07/0025.html + Closes #7362 + +- msnprintf: return number of printed characters excluding null byte + + ... even when the output is "capped" by the maximum length argument. + + Clarified in the docs. + + Closes #7361 + +- infof: remove newline from format strings, always append it + + - the data needs to be "line-based" anyway since it's also passed to the + debug callback/application + + - it makes infof() work like failf() and consistency is good + + - there's an assert that triggers on newlines in the format string + + - Also removes a few instances of "..." + + - Removes the code that would append "..." to the end of the data *iff* + it was truncated in infof() + + Closes #7357 + +- examples/multi-single: fix scan-build warning + + warning: Value stored to 'mc' during its initialization is never read + + Follow-up to ae8e11ed5fd2ce + + Closes #7360 + +- wolfssl: failing to set a session id is not reason to error out + + ... as it is *probably* just timed out. + + Reported-by: Francisco Munoz + + Closes #7358 + +- docs/examples: use curl_multi_poll() in multi examples + + The API is soon two years old and deserves being shown as the primary + way to drive multi code as it makes it much easier to write code. + + multi-poll: removed + + multi-legacy: add to show how we did multi API use before + curl_multi_wait/poll. + + Closes #7352 + +- KNOWN_BUGS: flaky Windows CI builds + + Closes #6972 + +- RELEASE-NOTES: synced + +- test1147: hyper doesn't allow "crazy" request headers like built-in + + ... so strip that from the test. + + Closes #7349 + +- c-hyper: bail on too long response headers + + To match with built-in behaviors. Makes test 1154 work. + + Closes #7350 + +- test1151: added missing CRLF to work with hyper + + Closes #7350 + +- c-hyper: add support for transfer-encoding in the request + + Closes #7348 + +- [Andrea Pappacoda brought this change] + + cmake: remove libssh2 feature checks + + libssh2 features are detected based on version since commit + 9dbbba997608f7c3c5de1c627c77c8cd2aa85b73 + + Closes #7343 + +- test1116: hyper doesn't pass through "surprise-trailers" + + Closes #7344 + +- socks4: scan for the IPv4 address in resolve results + + Follow-up to 84d2839740 which changed the resolving to always resolve + both address families, but since SOCKS4 only supports IPv4 it should + scan for and use the first available IPv4 address. + + Reported-by: shithappens2016 on github + Fixes #7345 + Closes #7346 + +Jay Satiro (5 Jul 2021) +- proto.d: fix formatting for paragraphs after margin changes + + Closes https://github.com/curl/curl/pull/7341 + +- pinnedpubkey.d: fix formatting for version support lists + + Closes https://github.com/curl/curl/pull/7340 + +Daniel Stenberg (2 Jul 2021) +- TODO: "Support in-memory certs/ca certs/keys" done + + Has been suppored for a while now with the *BLOB options. + +- examples: safer and more proper read callback logic + + The same callback code is used in: + + imap-append.c + smtp-authzid.c + smtp-mail.c + smtp-multi.c + smtp-ssl.c + smtp-tls.c + + It should not assume that it can copy full lines into the buffer as it + will encourage sloppy coding practices. Instead use byte-wise logic and + check/acknowledge the buffer size appropriately. + + Reported-by: Harry Sintonen + Fixes #7330 + Closes #7331 + +- test1519: adjusted to work with hyper + + Closes #7333 + +- test1518: adjusted to work with hyper + + ... by making sure the stdout output doesn't look like HTTP headers. + + Closes #7333 + +- test1514: add a CRLF to the response to make it correct + + Makes hyper accept it fine instead returning HYPERE_UNEXPECTED_EOF on + us. + + Closes #7334 + +- formdata: avoid "Argument cannot be negative" warning + + ... when converting a curl_off_t to size_t, by using + CURL_ZERO_TERMINATED before passing the argument to the function. + + Detected by Coverity CID 1486590. + + Closes #7328 + Assisted-by: Daniel Gustafsson + +- lib: more %u for port and int for %*s fixes + + Detected by Coverity + + Closes #7329 + +- doh: (void)-prefix call to curl_easy_setopt + +- lib: fix type of len passed to *printf's %*s + + ... it needs to be 'int'. Detected by Coverity CID 1486611 (etc) + + Closes #7326 + +- lib: use %u instead of %ld for port number printf + + Follow-up to 764c6bd3bf which changed the type of some port number + fields. Detected by Coverity (CID 1486624) etc. + + Closes #7325 + +- version: turn version number functions into returning void + + ... as we never use the return codes from them. + + Reviewed-by: Daniel Gustafsson + Closes #7319 + +- mqtt: extend the error message for no topic + + ... and mention that it needs URL encoding. + + Reported-by: Peter Körner + Fixes #7316 + Closes #7317 + +- formdata: correct typecast in curl_mime_data call + + Coverity pointed out it the mismatch. CID 1486590 + + Closes #7327 + +- url: (void)-prefix a curl_url_get() call + + Coverity (CID 1486645) pointed out a use of curl_url_get() in the + parse_proxy function where the return code wasn't checked. A + (void)-prefix makes the intention obvious. + + Closes #7320 + +- glob: pass an 'int' as len when using printf's %*s + + Detected by Coverity CID 1486629. + + Closes #7324 + +- vtls: use free() not curl_free() + + curl_free() is provided for users of the API to free returned data, + there's no need to use it internally. + + Closes #7318 + +- zuul: use the new rustls directory name + + Follow-up to 6d972c8b1cbb3 which missed updating this directory name. + + Also no longer call it crustls in the docs and bump to rusttls-ffi 0.7.1 + + Closes #7311 + +Jay Satiro (29 Jun 2021) +- http: fix crash in rate-limited upload + + - Don't set the size of the piece of data to send to the rate limit if + that limit is larger than the buffer size that will hold the piece. + + Prior to this change if CURLOPT_MAX_SEND_SPEED_LARGE + (curl tool: --limit-rate) was set then it was possible that a temporary + buffer used for uploading could be written to out of bounds. A likely + scenario for this would be a non-trivial amount of post data combined + with a rate limit larger than CURLOPT_UPLOAD_BUFFERSIZE (default 64k). + + The bug was introduced in 24e469f which is in releases since 7.76.0. + + perl -e "print '0' x 200000" > tmp + curl --limit-rate 128k -d @tmp httpbin.org/post + + Reported-by: Richard Marion + + Fixes https://github.com/curl/curl/issues/7308 + Closes https://github.com/curl/curl/pull/7315 + +Daniel Stenberg (29 Jun 2021) +- copyright: add boiler-plate headers to CI config files + + And whitelist .zuul.ignore + + Closes #7314 + +- CI: remove travis details + + Rename still used leftovers to "zuul" as that's now the CI using them. + + Closes #7313 + +- RELEASE-NOTES: synced + +- openssl: avoid static variable for seed flag + + Avoid the race condition risk by instead storing the "seeded" flag in + the multi handle. Modern OpenSSL versions handle the seeding itself so + doing the seeding once per multi-handle instead of once per process is + less of an issue. + + Reported-by: Gerrit Renker + Fixes #7296 + Closes #7306 + +- configure: inhibit the implicit-fallthrough warning on gcc-12 + + ... since it no longer acknowledges the comment markup we use for that + purpose. + + Reported-by: Younes El-karama + Fixes #7295 + Closes #7307 + +Daniel Gustafsson (28 Jun 2021) +- [Andrei Rybak brought this change] + + misc: fix typos in comments which repeat a word + + Fix typos in code comments which repeat various words. In trivial + cases, just delete the repeated word. Reword the affected sentence in + "lib/url.c" for it to make sense. + + Closes #7303 + Reviewed-by: Daniel Gustafsson + +Daniel Stenberg (27 Jun 2021) +- lib677: make it survive torture testing + + Follow-up to a5ab72d5edd7 + + Closes #7300 + +- [Tommy Chiang brought this change] + + docs/BINDINGS: fix outdated links + + * luacurl page is now not accessible, fix it with wayback machine page + * Scheme one seems not providing https now, change it back to http one + + Closes #7301 + +- [Jacob Hoffman-Andrews brought this change] + + curstls: bump crustls version and use new URL + + crustls moved to https://github.com/rustls/rustls-ffi. This also bumps + the expected version to 0.7.0. + + Closes #7297 + +- RELEASE-NOTES: synced + +- examples: length-limit two sscanf() uses of %s + + Reported-by: Jishan Shaikh + Fixes #7293 + Closes #7294 + +- [Richard Whitehouse brought this change] + + multi: alter transfer timeout ordering + + - Check whether a connection has succeded before checking whether it's + timed out. + + This means if we've connected quickly, but subsequently been + descheduled, we allow the connection to succeed. Note, if we timeout, + but between checking the timeout, and connecting to the server the + connection succeeds, we will allow it to go ahead. This is viewed as + an acceptable trade off. + + - Add additional failf logging around failed connection attempts to + propogate the cause up to the caller. + + Co-Authored-by: Martin Howarth + Closes #7178 + +- test677: IMAP CONNECT_ONLY, custom command and then exit + + Adjusted ftpserver.pl to add support for the IMAP IDLE command + + Adjusted test 660 to sync with the fix + +- multi: do not switch off connect_only flag when closing + + ... as it made protocol specific disconnect commands wrongly get used. + + Bug: https://curl.se/mail/lib-2021-06/0024.html + Reported-by: Aleksander Mazur + Closes #7288 + +- http: make the haproxy support work with unix domain sockets + + ... it should then pass on "PROXY UNKNOWN" since it doesn't know the + involved IP addresses. + + Reported-by: Valentín Gutiérrez + Fixes #7290 + Closes #7291 + +- [Xiang Xiao brought this change] + + curl.h: include sys/select.h for NuttX RTOS + + Closes #7287 + +- [Bin Meng brought this change] + + curl.h: remove the execution bit + + The execution bit of curl.h file was wrongly added: + + commit 2621025d6f96 ("curl.h: is supported by VxWorks7") + + and should be removed. + + Follow-up to 2621025d6f96 ("curl.h: is supported by VxWorks7") + Signed-off-by: Bin Meng + Closes #7286 + +- [Bin Lan brought this change] + + curl.h: is supported by VxWorks7 + + Closes #7285 + +- [Bachue Zhou brought this change] + + quiche: use send() instead of sendto() to avoid macOS issue + + sendto() always returns "Socket is already connected" error on macos + + Closes #7260 + +- [Li Xinwei brought this change] + + cmake: fix support for UnixSockets feature on Win32 + + Move the definition of sockaddr_un struct from config-win32.h to + curl_setup.h, so that it could be shared by all build systems. + + Add ADDRESS_FAMILY typedef for old mingw, now old mingw can also use + unix sockets. + + Also fix the build of tests/server/sws.c on Win32 when USE_UNIX_SOCKETS + is defined. + + Closes #7034 + +- [Gregory Muchka brought this change] + + hostip: (macOS) free returned memory of SCDynamicStoreCopyProxies + + From Apples documentation on SCDynamicStoreCopyProxies, "Return Value: A + dictionary of key-value pairs that represent the current internet proxy + settings, or NULL if no proxy settings have been defined or if an error + occurred. You must release the returned value." + + Failure to release the returned value of SCDynamicStoreCopyProxies can + result in a memory leak. + + Source: https://developer.apple.com/documentation/systemconfiguration/1517088-scdynamicstorecopyproxies + + Closes #7265 + +- RELEASE-NOTES: synced + +Jay Satiro (21 Jun 2021) +- vtls: fix warning due to function prototype mismatch + + b09c8ee changed the function prototype. Caught by Visual Studio. + +- curl_multibyte: Remove local encoding fallbacks + + - If the UTF-8 to UTF-16 conversion fails in Windows Unicode builds then + no longer fall back to assuming the string is in a local encoding. + + Background: + + Some functions in Windows Unicode builds must convert UTF-8 to UTF-16 to + pass to the Windows CRT API wide-character functions since in Windows + UTF-8 is not a valid locale (or at least 99% of the time right now). + + Prior to this change if the Unicode encoding conversion failed then + libcurl would assume, for backwards compatibility with applications that + may have written their code for non-Unicode builds, attempt to convert + the string from local encoding to UTF-16. + + That type of "best effort" could theoretically cause some type of + security or other problem if a string that was locally encoded was also + valid UTF-8, and therefore an unexpected UTF-8 to UTF-16 conversion + could occur. + + Ref: https://github.com/curl/curl/pull/7246 + + Closes https://github.com/curl/curl/pull/7257 + +Daniel Stenberg (20 Jun 2021) +- curl_endian: remove the unused Curl_write64_le function + + The last usage was removed in cca455a36 + + Closes #7280 + +- vtls: only store TIMER_APPCONNECT for non-proxy connect + + Introducing a 'isproxy' argument to the connect function so that it + knows wether to store the time stamp or not. + + Reported-by: Yongkang Huang + Fixes #7274 + Closes #7274 + +- gnutls: set the preferred TLS versions in correct order + + Regression since 781864bedbc57 (curl 7.77.0) + + Reported-by: civodul on github + Assisted-by: Nikos Mavrogiannopoulos + Fixes #7277 + Closes #7278 + +- [Gergely Nagy brought this change] + + configure/cmake: remove checks for unused gethostbyaddr and gethostbyaddr_r + + Closes #7276 + +- [Gergely Nagy brought this change] + + configure/cmake: remove checks for unused inet_ntoa and inet_ntoa_r + + Closes #7276 + +- [Gergely Nagy brought this change] + + configure/cmake: remove unused define HAVE_PERROR + + Closes #7276 + +- [Gergely Nagy brought this change] + + configure: remove unused check for gai_strerror + + Closes #7276 + +- [Gergely Nagy brought this change] + + configure/cmake: remove unused define HAVE_FREEIFADDRS + + Closes #7276 + +- [Gergely Nagy brought this change] + + configure/cmake: remove unused define HAVE_FORK + + Closes #7276 + +- [Gergely Nagy brought this change] + + configure/cmake: remove unused define HAVE_FDOPEN + + Closes #7276 + +- [Gergely Nagy brought this change] + + configure/cmake: remove checks for unused sgtty.h + + Closes #7276 + +- [Gergely Nagy brought this change] + + configure/cmake: remove remaining checks for rsa.h + + Closes #7276 + +- [Gergely Nagy brought this change] + + configure/cmake: remove remaining checks for err.h + + Closes #7276 + +- [Gergely Nagy brought this change] + + configure/cmake: remove remaining checks for crypto.h + + Closes #7276 + +- [Gergely Nagy brought this change] + + configure/cmake: remove checks for unused getservbyport_r + + Closes #7276 + +- --socks4[a]: clarify where the host name is resolved + + Closes #7273 + +- libcurl-security.3: mention file descriptors and forks + + ... and move the security report section last. + + Reported-by: Harry Sintonen + Closes #7270 + +- [Alex Xu (Hello71) brought this change] + + configure.ac: make non-executable + + it needs to be processed by autoconf or autoreconf, and doesn't have a + suitable shebang to be directly executed. other projects normally set + configure.ac -x. + + Closes #7272 + +- configure: do not strip out debug flags + + To allow users to set them when invoking configure without using + --with-debug. + + Reported-by: Alex Xu + Fixes #7216 + Closes #7267 + +- libssh2: limit time a disconnect can take to 1 second + + Closes #7271 + +- TLS: prevent shutdown loops to get stuck + + ... by making sure the loops are only allowed to read the shutdown + traffic a limited number of times. + + Reported-by: Harry Sintonen + Closes #7271 + +- hyper: propagate errors back up from read callbacks + + Makes test 513 work with hyper + + Closes #7266 + +- KNOWN_BUGS: Negotiate on Windows fails + + Closes #5881 + +- KNOWN_BUGS: renames instead of locking for atomic operations + + Closes #6882 + Closes #6884 + +- zuul: add two missing CI jobs + + ... that were configured, just not run + + Closes #7261 + +Viktor Szakats (15 Jun 2021) +- idn: fix libidn2 with windows unicode builds + + Unicode Windows builds use UTF-8 strings internally in libcurl, + so make sure to call the UTF-8 flavour of the libidn2 API. Also + document that Windows builds with libidn2 and UNICODE do expect + CURLOPT_URL as an UTF-8 string. + + Reported-by: dEajL3kA on github + Assisted-by: Jay Satiro + Reviewed-by: Marcel Raad + Closes #7246 + Fixes #7228 + +Daniel Stenberg (15 Jun 2021) +- curl_url_set: reject spaces in URLs w/o CURLU_ALLOW_SPACE + + They were never officially allowed and slipped in only due to sloppy + parsing. Spaces (ascii 32) should be correctly encoded (to %20) before + being part of a URL. + + The new flag bit CURLU_ALLOW_SPACE when a full URL is set, makes libcurl + allow spaces. + + Updated test 1560 to verify. + + Closes #7073 + +- RELEASE-NOTES: synced + + ... and bump to version 7.78.0 for the next planned release. + +Jay Satiro (15 Jun 2021) +- docs: Remove outdated curl tool limitation + + - Document that HTTP/2 multiplexing is supported by the curl tool when + parallel transfers are used. + + Supported since 7.66.0 via --parallel, but the doc wasn't updated. + + Closes https://github.com/curl/curl/pull/7259 + +- http2: Clarify 'Using HTTP2' verbose message + + - Change phrasing from multi-use to multiplexing since the former may + not be as well understood. + + Before: * Using HTTP2, server supports multi-use + + After: * Using HTTP2, server supports multiplexing + + Bug: https://github.com/curl/curl/discussions/7255 + Reported-by: David Hu + + Closes https://github.com/curl/curl/pull/7258 + +Daniel Stenberg (14 Jun 2021) +- winbuild/README: VC should be set to 6 'or larger' + + Previously it listed all versions up to 15 (missing 16) but this new + phrasing is more open ended. + + Reported-by: Hugh Macdonald + Fixes #7253 + Closes #7254 + +- [Jacob Hoffman-Andrews brought this change] + + rustls: remove native_roots fallback + + For the commandline tool, we expect to be passed + SSL_CONN_CONFIG(CAfile); for library use, the use should pass a set of + trusted roots (like in other TLS backends). + + This also removes a dependency on Security.framework when building on + macOS. + + Closes #7250 + +- [Albin Vass brought this change] + + travis: remove jobs that have migrated to zuul + + Closes #7245 + +- [Mohammed Naser brought this change] + + CI: add jobs using Zuul + + It also includes a few changes to get the builds going: + - Added autoconf to common dependencies + - Added automake to common dependencies + - Added libtool to common dependencies + - Added libssl-dev to common dependencies + + Co-authored-by: Albin Vass + + Closes #7245 + +- netrc: skip 'macdef' definitions + + Add test 494 to verify + + Reported-by: Harry Sintonen + Fixes #7238 + Closes #7244 + +- multi: add scan-build-6 work-around in curl_multi_fdset + + scan-build-6 otherwise warns, saying: warning: The left operand of '>=' + is a garbage value otherwise, which is false. + + Later scan-builds don't claim this on the same code. + + Closes #7248 + +- asyn-ares: remove check for 'data' in Curl_resolver_cancel + + It implied it would survive a NULL in there which it won't. Instead do + an assert. + + Pointed out by scan-build. + + Closes #7248 + +- url.c: remove two variable assigns that are never read + + Pointed out by scan-build + + Closes #7248 + +- [Gealber Morales brought this change] + + mqtt: add support for username and password + + Minor-edits-by: Daniel Stenberg + Added test 2200 to 2205 + + Closes #7243 + +- travis: remove the arm job + + We do it on circle CI instead + +- CI: add .circleci/config.yml + + Assisted-by: Gabriel Simmer + + Closes #7239 + +- RELEASE-NOTES: synced + +- runtests: init $VERSION to avoid warnings when using -l + +- openssl: don't remove session id entry in disassociate + + When a connection is disassociated from a transfer, the Session ID entry + should remain. + + Regression since 7f4a9a9 (shipped in libcurl 7.77.0) + Reported-by: Gergely Nagy + Reported-by: Paul Groke + + Fixes #7222 + Closes #7230 + +- single_transfer: ignore blank --output-dir + + ... as otherwise it creates a rather unexpected target directory with a + leading slash. + + Reported-by: Harry Sintonen + Fixes #7218 + Closes #7233 + +- tests: update README about servers and port numbers + + Closes #7242 + +- conn_shutdown: if closed during CONNECT cleanup properly + + Reported-by: Alex Xu + Reported-by: Phil E. Taylor + + Fixes #7236 + Closes #7237 + +- [Christian Weisgerber brought this change] + + sws: malloc request struct instead of using stack + + ... 2MB requests is otherwise just too big for some systems. + + (The allocations are not freed properly.) + + Bug: https://curl.se/mail/lib-2021-06/0018.html + + Closes #7235 + +- [Mark Swaanenburg brought this change] + + lib: don't compare fd to FD_SETSIZE when using poll + + FD_SETSIZE is irrelevant when using poll. So ensuring that the file + descriptor is smaller than FD_SETSIZE in VALID_SOCK, can cause + multi_wait to ignore perfectly valid file descriptors and simply wait + for 1s to avoid hammering the CPU in a busy loop. + + Fixes #7240 + Closes #7241 + +- [zhangxiuhua brought this change] + + doh: fix wrong DEBUGASSERT for doh private_data + + Closes #7227 + +- [yb999 brought this change] + + tests: update README.md with a missing single quote + + Closes #7231 + +- GHA: run all tests for hyper too + + As it lists disabled ones in DISABLED now + + Closes #7209 + +- tests/data/DISABLED: add tests not working with hyper + + The goal is to remove them all from here over time. + + Closes #7209 + +- runtests: also find the last test in Makefile.inc + + Closes #7209 + +- test3010: work with hyper mode + + Closes #7209 + +- configure: disable RTSP when hyper is selected + + Makes test 1013 work + + Closes #7209 + +- test1594/1595/1596: fix to work in hyper mode + + Closes #7209 + +- test1438/1457: add HTTP keyword to make hyper mode work + + Closes #7209 + +- test1340/1341: adjusted for hyper mode + + Closes #7209 + +- test1218: adjusted for hyper mode + + Closes #7209 + +- test1216: adjusted for hyper mode + + Closes #7209 + +- test1230: adjust to work in hyper mode + + Closes #7209 + +- c-hyper: abort CONNECT response reading early on non 2xx responses + + Fixes test 493 + + Closes #7209 + +- test434: add HTTP keyword + + Closes #7209 + +- test599: adjusted to work in hyper mode + + Closes #7209 + +- c-hyper: fix the uploaded field in progress callbacks + + Makes test 578 work + + Closes #7209 + +- test566: adjust to work with hyper mode + + Closes #7209 + +- [Fawad Mirza brought this change] + + CURLOPT_WRITEFUNCTION.3: minor update of the example + + Safely avoid chunk.size garbage value if declared non globally. + + Closes #7219 + +- [Bastian Krause brought this change] + + configure: rename get-easy-option configure option to get-easy-options + + "get-easy-options" is the configure option advertised by the help text + anyway, so use that. + + Fixes #7211 + Closes #7213 + + Follow-up to ad691b191 ("configure: added --disable-get-easy-options") + Suggested-by: Daniel Stenberg + Signed-off-by: Bastian Krause + +- runtests: skip disabled tests unless -f is used + + To make it easier to write ranges like '115 to 229' without that + explicitly enabling tests that are listed in DISABLED, this makes + runtests always skip disabled tests unless the -f command line option is + used. + + Previously the code attempted to not run such tests, but didn't do it + correctly. + + Closes #7212 + +- [Jun-ya Kato brought this change] + + ngtcp2: disable TLSv1.3 compatible mode when using GnuTLS + + The latest GnuTLS-3.7.2 implements disable switch for TLSv1.3 compatible + mode for middle box but it is enabled by default, which is unnecessary + for QUIC. + + Fixes #6896 + Closes #7202 + +- test644: remove as duplicate of test 587 + + Closes #7208 + +Daniel Gustafsson (8 Jun 2021) +- RELEASE-NOTES: synced + +- cookies: track expiration in jar to optimize removals + + Removing expired cookies needs to be a fast operation since we want to + be able to perform it often and speculatively. By tracking the timestamp + of the next known expiration we can exit early in case the timestamp is + in the future. + + Closes: #7172 + Reviewed-by: Daniel Stenberg + +Daniel Stenberg (7 Jun 2021) +- GHA: add several libcurl tests to the hyper job + + 500 to 512 + +- test500: adjust to work with hyper mode + +- c-hyper: support CURLINFO_STARTTRANSFER_TIME + + Closes #7204 + +- c-hyper: support CURLOPT_HEADER + + When enabled, the headers are passed to the body write callback as well. + + Like in test 500 + + Closes #7204 + +- GHA: run the newly fixed tests with hyper + + Closes #7205 + +- test433: adjust for hyper mode + + Closes #7205 + +- test395: hyper cannot work around > 64 bit content-lengths like built-in + + Closes #7205 + +- test394: hyper returns a different error + + Closes #7205 + +- test393: make Content-Length fit within 64 bit for hyper + + Closes #7205 + +- test347: CRLFify to work in hyper mode + + Closes #7205 + +- test339: CRLFify better to work in hyper mode + + Closes #7205 + +- travis: remove the hyper build + +- GHA: add a linux-hyper job + + Closes #7206 + +- test328: avoid a header-looking body to make hyper mode work + + The test still works the same, just modified two bytes in the content. + + Closes #7203 + +- release-notes.pl: also spot common 'closes' typo + +- metalink: remove + + Warning: this will make existing curl command lines that use metalink to + stop working. + + Reasons for removal: + + 1. We've found several security problems and issues involving the + metalink support in curl. The issues are not detailed here. When + working on those, it become apparent to the team that several of the + problems are due to the system design, metalink library API and what + the metalink RFC says. They are very hard to fix on the curl side + only. + + 2. The metalink usage with curl was only very briefly documented and was + not following the "normal" curl usage pattern in several ways, making + it surprising and non-intuitive which could lead to further security + issues. + + 3. The metalink library was last updated 6 years ago and wasn't so + active the years before that either. An unmaintained library means + there's a security problem waiting to happen. This is probably reason + enough. + + 4. Metalink requires an XML parsing library, which is complex code (even + the smaller alternatives) and to this day often gets security + updates. + + 5. Metalink is not a widely used curl feature. In the 2020 curl user + survey, only 1.4% of the responders said that they'd are using it. In + 2021 that number was 1.2%. Searching the web also show very few + traces of it being used, even with other tools. + + 6. The torrent format and associated technology clearly won for + downloading large files from multiple sources in parallel. + + Cloes #7176 + +- docs/INSTALL: remove mentions of configure --with-darwin-ssl + + ... as it isn't supported since a while back. + + Make configure fail with a warning if used. + + Reported-by: Vadim Grinshpun + Bug: https://curl.se/mail/lib-2021-06/0008.html + Closes #7200 + +- RELEASE-NOTES: synced + +- [Gregor Jasny brought this change] + + cmake: Avoid leaking absolute paths into exported config + + The `find_libarary` command resolves the library or framework + into an absolute path. In case of system frameworks which are + located within an Xcode-provided SDK this results in the Xcode + path and SDK version being part of the library path. + + Because those library paths end up in the exported CMake config + importing curl will fail once the Xcode location or SDK version + changes: + + ```cmake + set_target_properties(CURL::libcurl PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include" + INTERFACE_LINK_LIBRARIES "lber;ldap;/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.3.sdk/System/Library/Frameworks/SystemConfiguration.framework;OpenSSL::SSL;OpenSSL::Crypto;ZLIB::ZLIB" + ) + ``` + + A work-around is to link against system-level frameworks with + `-framework XYZ`. In case of `SystemConfiguration` we might be able + to omit the lookup-check because we could assume the framework is + always present. + + Closes #7152 + +- [Shikha Sharma brought this change] + + http2_connisdead: handle trailing GOAWAY better + + When checking the connection the input processing returns error + immediately, we now consider that a dead connnection. + + Bug: https://curl.se/mail/lib-2021-06/0001.html + Closes #7192 + +- [Dmitry Karpov brought this change] + + ares: always store IPv6 addresses first + + Trying dual-stack on some embedded platform, I noticed that quite + frequently (20%) libCurl starts from IPv4 regardless the Happy Eyeballs + timeout value. After debugging this issue, I noticed that this happens + if c-ares resolver response for IPv6 family comes before IPv4 (which was + randomly happening in my tests). + + In such cases, because libCurl puts the last resolver response on top of + the address list, when IPv4 resolver response comes after IPv6 one - the + IPv4 family starts the connection phase instead of IPv6 family. + + The solution for this issue is to always put IPv6 addresses on top of + the address list, regardless the order of resolver responses. + + Bug: https://curl.se/mail/lib-2021-06/0003.html + + Closes #7188 + +- Revert "Revert "socketpair: fix potential hangs"" + + This reverts commit 3e70c3430a370a31eff2c1d8fea29edaca8f1127. + + Thus brings back the change from #7144 as was originally landed in + c769d1eab4de8b + + Closes #7144 (again) + +- [Ebe Janchivdorj brought this change] + + schannel: move code out of SChannel_connect_step1 + + Reviewed-by: Marc Hoersken + Closes #7168 + +- tests/data/Makefile.inc: error: trailing backslash on last line + + Follow-up to d8dcb399b8009d + +- TODO: Support rate-limiting for MQTT + +- [Dmitry Kostjuchenko brought this change] + + warnless: simplify type size handling + + By using sizeof(T), existing defines and relying on the compiler to + define the required signed/unsigned mask. + + Closes #7181 + +Gisle Vanem (4 Jun 2021) +- [Win32] Fix for USE_WATT32 + + My Watt-32 tcp/ip stack works on Windows but it does not have `WSAIoctl()` + +Daniel Stenberg (4 Jun 2021) +- [Alexis Vachette brought this change] + + url: bad CURLOPT_CONNECT_TO syntax now returns error + + Added test 3020 to verify + + Closes #7183 + +- github: remove the cmake macOS gcc-8 jobs + + They're too similar to the gcc-9 ones to be useful (and seems to not + work anymore). + + Closes #7187 + +- test269: disable for hyper + + --ignore-content-length / CURLOPT_IGNORE_CONTENT_LENGTH doesn't work + with hyper. + + Closes #7184 + +- runtests: enable 'hyper mode' only for HTTP tests + + The 'hyper mode' makes line-ending checks work in the test suite for + when hyper is used. Now it also requires that HTTP or HTTPS are + mentioned as keywords to be enabled so that it doesn't wrongly adjusts + tests for other protocols. + + This makes test 271 (TFTP) work again in hyper enabled builds. + + Closes #7185 + +- [Alexis Vachette brought this change] + + hostip: bad CURLOPT_RESOLVE syntax now returns error + + Added test 3019 + Fixes #7170 + Closes #7174 + +Daniel Gustafsson (3 Jun 2021) +- cookies: fix typo and expand comment + + Fix a typo in the sorting comment, and while in there elaborate slightly + on why creationtime can be used as a tiebreaker. + +- cookies: remove unused header + + Commit 1c1d9f1affbd3367bcb24062e261d0ea5d185e3a removed the last use + for the inet_pton.h headerfile, this removes the inclusion of the + header. + + Closes: #7182 + Reviewed-by: Daniel Stenberg + +Daniel Stenberg (3 Jun 2021) +- Revert "socketpair: fix potential hangs" + + This reverts commit c769d1eab4de8b9f1bd84d992c63692fdc43c5be. + + See #7144 for details + +- [Paul Groke brought this change] + + socketpair: fix potential hangs + + Fixes potential hang in accept by using select + non-blocking accept. + + Fixes potential hang in peer check by replacing the send/recv check with + a getsockname/getpeername check. + + Adds length check for returned sockaddr data. + + Closes #7144 + +- runtests: parse data/Makefile.inc instead of using make + + The warning about missing entries in that file then doesn't require that + the Makefile has been regenerated which was confusing. + + The scan for the test num is a little more error prone than before + (since now it doesn't actually verify that it is legitimate Makefile + syntax), but I think it is good enough. + + Closes #7177 + +- [Harry Sintonen brought this change] + + filecheck: quietly remove test-place/*~ + + Closes #7179 + +- CURLE_SETOPT_OPTION_SYNTAX: new error name for wrong setopt syntax + + For options that pass in lists or strings that are subsequently parsed + and must be correct. This broadens the scope for the option previously + known as CURLE_TELNET_OPTION_SYNTAX but the old name is of course still + provided as a #define for existing applications. + + Closes #7175 + +- tests: fix Accept-Encoding strips to work with Hyper builds + + The previous strip also removed the CR which turned problematic. + + valgrind.supp: add zstd suppression using hyper + + Reported-and-analyzed-by: Kevin Burke + Fixes #7169 + Closes #7171 + +- github: timeout jobs on macOS after 90 minutes + + Assisted-by: Marc Hoersken + Closes #7173 + +- [Harry Sintonen brought this change] + + mqtt: detect illegal and too large file size + + Add test 3017 and 3018 to verify. + Closes #7166 + +- [Abhinav Singh brought this change] + + cmake: add CURL_DISABLE_NTLM option + + Closes #7028 + +- [Abhinav Singh brought this change] + + configure: add --disable-ntlm option + + Closes #7028 + +- [Abhinav Singh brought this change] + + define: re-add CURL_DISABLE_NTLM and corresponding ifdefs + + This flag will be further exposed by adding build options. + + Reverts #6809 + Closes #7028 + +- RELEASE-NOTES: synced + +Viktor Szakats (1 Jun 2021) +- travis: delete --enable-hsts option (it is the default now) [ci skip] + + Reviewed-by: Daniel Stenberg + Closes #7167 + +Daniel Stenberg (1 Jun 2021) +- hostip: fix 3 coverity complaints + + Follow-up to 1a0ebf6632f889eed + + - Check the return code to Curl_inet_pton() in two instances, even + though we know the input is valid so the functions won't fail. + + - Clear the 'struct sockaddr_in' struct before use so that the + 'sin_zero' field isn't left uninitialized. + + Detected by Coverity. + Assisted-by: Harry Sintonen + Closes #7163 + +- c-hyper: fix NTLM on closed connection tested with test159 + + Closes #7154 + +- conncache: lowercase the hash key for better match + + As host names are case insensitive, the use of case sensitive hashing + caused unnecesary cache misses and therefore lost performance. This + lowercases the hash key. + + Reported-by: Harry Sintonen + Fixes #7159 + Closes #7161 + +- mbedtls: make mbedtls_strerror always work + + If the function doesn't exist, provide a macro that just clears the + error message. Removes #ifdef uses from the code. + + Closes #7162 + +- vtls: exit addsessionid if no cache is inited + + Follow-up to b249592d29ae0 + + Avoids NULL pointer derefs. + + Closes #7165 + +- [Harry Sintonen brought this change] + + Curl_ntlm_core_mk_nt_hash: fix OOM in error path + + Closes #7164 + +Michael Kaufmann (1 Jun 2021) +- ssl: read pending close notify alert before closing the connection + + This avoids a TCP reset (RST) if the server initiates a connection + shutdown by sending an SSL close notify alert and then closes the TCP + connection. + + For SSL connections, usually the server announces that it will close the + connection with an SSL close notify alert. curl should read this alert. + If curl does not read this alert and just closes the connection, some + operating systems close the TCP connection with an RST flag. + + See RFC 1122, section 4.2.2.13 + + If curl reads the close notify alert, the TCP connection is closed + normally with a FIN flag. + + The new code is similar to existing code in the "SSL shutdown" function: + try to read an alert (non-blocking), and ignore any read errors. + + Closes #7095 + +Daniel Stenberg (1 Jun 2021) +- [Laurent Dufresne brought this change] + + setopt: fix incorrect comments + + Closes #7157 + +- [Laurent Dufresne brought this change] + + mbedtls: add support for cert and key blob options + + CURLOPT_SSLCERT_BLOB and CURLOPT_SSLKEY_BLOB weren't usable with + mbedtls backend, so the support was added. + + Closes #7157 + +- [Gregor Jasny brought this change] + + cmake: try well-known send/recv signature for Apple + + The CMake `try_compile` command is especially slow for + the Xcode generator. With this patch applied it first tests + for the currently used (and Open Group specified) send/recv + signature. In case this fails testing falls-back to the + permutations. + + speed-up: + + ``` + time cmake .. -GNinja -DCMAKE_USE_SECTRANSP=ON -DHTTP_ONLY=ON -DCMAKE_USE_LIBSSH2=OFF + before: 11.64s user 11.09s system 55% cpu 40.754 total + after: 7.84s user 6.57s system 51% cpu 28.074 total + ``` + + ``` + time cmake .. -GXcode -DCMAKE_USE_SECTRANSP=ON -DHTTP_ONLY=ON -DCMAKE_USE_LIBSSH2=OFF + before: 217.07s user 104.15s system 60% cpu 8:51.79 total + after: 108.76s user 51.80s system 58% cpu 4:32.58 total + ``` + + Closes #7158 + +- http2: init recvbuf struct for pushed streams + + Debug builds would warn that these structs were not initialized properly + for pushed streams. + + Ref: #7148 + Closes #7153 + +- Curl_ssl_getsessionid: fail if no session cache exists + + This function might get called for an easy handle for which the session + cache hasn't been setup. It now just returns a "miss" in that case. + + Reported-by: Christoph M. Becker + Fixes #7148 + Closes #7153 + +- GOVERNANCE: add 'user', 'committer' and 'contributor' + + As those are commonly used terms in the project. + + Closes #7151 + +- URL-SYNTAX.md: document the new 'localhost' treatment + +- hostip: make 'localhost' return fixed values + + Resolving the case insensitive host name 'localhost' now returns the + addresses 127.0.0.1 and (if IPv6 is enabled) ::1 without using any + resolver. + + This removes the risk that users accidentally resolves 'localhost' to + something else. By making sure 'localhost' is always local, we can + assume a "secure context" for such transfers (for cookies etc). + + Closes #7039 + +Daniel Gustafsson (31 May 2021) +- docs: fix typos + +Daniel Stenberg (30 May 2021) +- hsts: ignore numberical IP address hosts + + Also, use a single function library-wide for detecting if a given hostname is + a numerical IP address. + + Reported-by: Harry Sintonen + Fixes #7146 + Closes #7149 + +- test178: adjust for hyper + + Hyper returns the same error for wrong HTTP version as for negative + content-length. Test 178 verifies that negative content-length is + rejected but the hyper backend will return a different error for it (and + without any helpful message telling why the message was bad). It will + also not return any headers at all for the response, not even the ones + that arrived before the error. + + Closes #7147 + +- HYPER: remove mentions of deprecated development branch + +- c-hyper: handle NULL from hyper_buf_copy() + + Closes #7143 + +- HSTS: not experimental anymore + +- [Douglas R. Reno brought this change] + + INSTALL: use correct extension for CURL-DISABLE.md + + In INSTALL.MD, it's currently set to CURL-DISABLE-md instead of + CURL-DISABLE.md. This generates a 404 on the cURL website as well as + when viewing the docs through Github. + + Closes #7142 + +- travis: run tests 1 - 153 with hyper + +- c-hyper: convert HYPERE_INVALID_PEER_MESSAGE to CURLE_UNSUPPORTED_PROTOCOL + + Makes test 129 work (HTTP/1.2 response). + + Closes #7141 + +- http_proxy: deal with non-200 CONNECT response with Hyper + + Makes test 94 and 95 work + + Closes #7141 + +- c-hyper: clear NTLM auth buffer when request is issued + + To prevent previous ones to get reused on subsequent requests. Matches + how the built-in HTTP code works. Makes test 90 to 93 work. + + Add test 90 to 93 in travis. + + Closes #7139 + +- [Joel Depooter brought this change] + + schannel: set ALPN length correctly for HTTP/2 + + In a3268eca792f1 this code was changed to use the ALPN_H2 constant + instead of the NGHTTP2_PROTO_ALPN constant. However, these constants are + not the same. The nghttp2 constant included the length of the string, + like this: "\x2h2". The ALPN_H2 constant is just "h2". Therefore we need + to re-add the length of the string to the ALPN buffer. + + Closes #7138 + +- travis: run tests 1-89 in the hyper build + + Closes #7137 + +- Revert "c-hyper: handle body on HYPER_TASK_EMPTY" + + This reverts commit c3eefa95c31f55657f0af422e8268d738f689066. + + Reported-by: Kevin Burke + Fixes #7122 + Closes #7136 + +- [Jon Rumsey brought this change] + + ccsidcurl: fix the compile errors + + Looks like the declaration of cpp shoule be const char ** and return + null if convert_version_info_string fails. + + Fixes #7134 + Closes #7135 + +- [Viktor Szakats brought this change] + + docs: use --max-redirs instead of --max-redir + + For consistency. + + Closes #7130 + +- RELEASE-NOTES: synced + + ... and bump to 7.77.1 + +- [Michael Forney brought this change] + + travis: add bearssl build + + Closes #7133 + +- [Michael Forney brought this change] + + bearssl: explicitly initialize all fields of Curl_ssl + + Also, add comments like the other vtls backends. + + Closes #7133 + +- [Michael Forney brought this change] + + bearssl: remove incorrect const on variable that is modified + + hostname may be set to NULL later on in this function if it is an + IP address. + + Closes #7133 + +Version 7.77.0 (26 May 2021) + +Daniel Stenberg (26 May 2021) +- RELEASE-NOTES: synced + +- THANKS: added contributors from 7.77.0 cycle + +- copyright: update copyright year ranges to 2021 + +- [Radek Zajic brought this change] + + hostip: fix broken macOS/CMake/GCC builds + + Follow-up to 31f631a142d855f06 + + Fixes #7128 + Closes #7129 + +- TODO: netrc caching and sharing + + URL: https://curl.se/mail/archive-2021-05/0018.html + +- [Orgad Shaneh brought this change] + + setopt: streamline ssl option code + + Make it use the same style as the code next to it + + Closes #7123 + +- [Radek Zajic brought this change] + + lib/hostip6.c: make NAT64 address synthesis on macOS work + + Closes #7121 + +- [ejanchivdorj brought this change] + + sectransp: fix EXC_BAD_ACCESS caused by uninitialized buffer + + When the SecCertificateCopyCommonName function fails, it leaves + common_name in a invalid state so CFStringCompare uses the invalid + result, causing EXC_BAD_ACCESS. + + The fix is to check the return value of the function before using the + name. + + Closes #7126 + +- [Paweł Wegner brought this change] + + CMake: add CURL_ENABLE_EXPORT_TARGET option + + install(EXPORT ...) causes trouble when embedding curl dependencies + which don't provide install(EXPORT ...) targets (e.g libressl and + nghttp2) with cmake's add_subdirectory. + + Reviewed-by: Jakub Zakrzewski + Closes #7060 + +- [Alessandro Ghedini brought this change] + + quiche: update for network path aware API + + Latest version of quiche requires the application to pass the peer + address of received packets, and it provides the address for outgoing + packets back. + + Closes #7120 + +- [Jacob Hoffman-Andrews brought this change] + + rustls: switch read_tls and write_tls to callbacks + + And update to 0.6.0, including a rename from session to connection for + many fields. + + Closes #7071 + +- [Koichi Shiraishi brought this change] + + sectransp: fix 7f4a9a9b2a49 commit about missing comma + + Follow-up to 7f4a9a9b2a495 + + Closes #7119 + +- [Harry Sintonen brought this change] + + openssl: associate/detach the transfer from connection + + CVE-2021-22901 + + Bug: https://curl.se/docs/CVE-2021-22901.html + +- [Harry Sintonen brought this change] + + telnet: check sscanf() for correct number of matches + + CVE-2021-22898 + + Bug: https://curl.se/docs/CVE-2021-22898.html + +- schannel: don't use static to store selected ciphers + + CVE-2021-22897 + + Bug: https://curl.se/docs/CVE-2021-22897.html + +- docs/tests: remove freenode references + +- RELEASE-NOTES: synced + +- [Sergey Markelov brought this change] + + NSS: make colons, commas and spaces valid separators in cipher list + + Fixes #7110 + Closes #7115 + +- curl: include libmetalink version in --version output + + Closes #7112 + +Jay Satiro (21 May 2021) +- [Matias N. Goldberg brought this change] + + cmake: Use multithreaded compilation on VS 2008+ + + Multithreaded compilation has been supported since at least VS 2005 and + been robustly stable since at least VS 2008 + + Closes https://github.com/curl/curl/pull/7109 + +Daniel Stenberg (21 May 2021) +- [Matias N. Goldberg brought this change] + + cmake: fix two invokes result in different curl_config.h + + Fixes #7100 + Closes #7101 + + Reviewed-by: Jakub Zakrzewski + Signed-off-by: Matias N. Goldberg + +- [Peng-Yu Chen brought this change] + + cmake: detect CURL_SA_FAMILY_T + + Fixes #7049 + Closes #7065 + +- [Lucas Clemente Vella brought this change] + + CURLOPT_IPRESOLVE: preventing wrong IP version from being used + + In some situations, it was possible that a transfer was setup to + use an specific IP version, but due do DNS caching or connection + reuse, it ended up using a different IP version from requested. + + This commit changes the effect of CURLOPT_IPRESOLVE from simply + restricting address resolution to preventing the wrong connection + type being used, when choosing a connection from the pool, and + to restricting what addresses could be used when establishing + a new connection. + + It is important that all addresses versions are resolved, even if + not used in that transfer in particular, because the result is + cached, and could be useful for a different transfer with a + different CURLOPT_IPRESOLVE setting. + + Closes #6853 + +- [Oliver Urbann brought this change] + + AmigaOS: add functions definitions for SHA256 + + AmiSSL replaces many functions with macros. Curl requires pointer + to some of these functions. Thus, we have to encapsulate these macros: + SHA256_Init, SHA256_Update, SHA256_Final, X509_INFO_free. + + Bug: https://github.com/jens-maus/amissl/issues/15 + Co-authored-by: Daniel Stenberg + + Closes #7099 + +- test2100: make it run with and require IPv6 + + Closes #7083 + +- tests/getpart: generate output URL encoded for better diffs + + Closes #7083 + +- [Ryan Beck-Buysse brought this change] + + docs/TheArtOfHttpScripting: fix markdown links + + extra parens cause the links to be incorrectly formatted + and inconsistent with the rest of the document. + + Signed-off-by: Ryan Beck-Buysse + Closes #7097 + +- RELEASE-NOTES: synced + +- [Emil Engler brought this change] + + docs: replace dots with dashes in markdown enums + + We use dashes instead of dots nearly everywhere except for those few + cases. This commit addresses this issues and brings more coherency into + it. + + Closes #7093 + +- [Emil Engler brought this change] + + docs: improve INTERNALS.md regarding getsock cb + + This adds the I/O prefix to indicate that those "actions" are kind-of + related to those found in select(2) or poll(2) (reading/writing). + + It also adds a note where the prototypes of those functions can be found + in the source code. + + Closes #7092 + +- [Emil Engler brought this change] + + docs: document attach in INTERNALS.md + + The new field in the Curl_handler struct still lacks documentation. This + adds it it from the information extracted from lib/urldata.h:797 + + Closes #7091 + +- [Marc Aldorasi brought this change] + + config: remove now-unused macros + + Closes #7094 + +- [Marc Aldorasi brought this change] + + hostip.h: remove declaration of unimplemented function + + Closes #7094 + +- h3: add 'attach' callback to protocol handlers + + Follow-up to 0c55fbab45be + + Reviewed-by: Emil Engler + Closes #7090 + +- wolfssl: remove SSLv3 support leftovers + + Closes #7088 + +- curl-wolfssl.m4: without custom include path, assume /usr/include + + ... so that we can point out the root of the OpenSSL emulation headers. + Previously this used the '$includedir' variable which is wrong since + that defaults to the dir where the current configure invoke will install + the built libcurl headers: /usr/local by default. + + Fixes #7085 + Reported-by: Joel Jakobsson + Closes #7087 + +- [Joel Depooter brought this change] + + data_pending: check only SECONDARY socket for FTP(S) transfers + + Check the FIRST for all other protocols. + + This fixes a timeout in an ftps download. The server sends a TLS + close_notify message in the same packet as the file data. The + close_notify seems to not be handled in the schannel_recv function, so + libcurl is not aware that the server has closed the connection. Thus + libcurl ends up waiting for action on the socket until a timeout is + reached. With the secondary socket check added to the data_pending + function, the close_notify is properly handled, and the ftps transfer + terminates as expected. + + Fixes #7068 + Closes #7069 + +- github: inhibit deprecated declarations for clang on macOS + + ... as they otherwise cause ldap build errors in the CI. + + Fixes #7081 + Closes #7082 + +- conn: add 'attach' to protocol handler, make libssh2 use it + + The libssh2 backend has SSH session associated with the connection but + the callback context is the easy handle, so when a connection gets + attached to a transfer, the protocol handler now allows for a custom + function to get used to set things up correctly. + + Reported-by: Michael O'Farrell + Fixes #6898 + Closes #7078 + +- http2: make sure pause is done on HTTP + + Since the function is called for any protocol, we can't assume that the + HTTP struct is there without first making sure it is HTTP. + + Reported-by: Denis Goleshchikhin + Fixes #7079 + Closes #7080 + +- docs: cookies from HTTP headers need domain set + + ... or the cookies won't get sent. Push users to using the "Netscape" + format instead, which curl uses when saving a cookie "jar". + + Reported-by: Martin Dorey + Reviewed-by: Daniel Gustafsson + Fixes #6723 + Closes #7077 + +- RELEASE-NOTES: synced + +- github: add a workflow with libssh2 on macOS using cmake + + Closes #7047 + +- sws: allow HTTP requests up to 2MB in size + + To allow tests with slightly larger payloads. Like #7071 ... + + Closes #7075 + +Marc Hoersken (16 May 2021) +- CI/azure: increase verbosity and fix outdated task names + + Closes #7063 + +- CI/cirrus: add shared and static Windows release builds + + Azure Pipelines is currently being used for debug builds, + let's also run some non-debug (release) Windows builds and + make use of previously underutilized Cirrus CI for that. + + Reviewed-by: Marcel Raad + + Closes #6991 + +Daniel Stenberg (16 May 2021) +- CURLOPT_CAPATH.3: defaults to a path, not NULL + + Reported-by: Andrew Barnert + + Closes #7062 + +- [Jacob Hoffman-Andrews brought this change] + + c-hyper: handle body on HYPER_TASK_EMPTY + + Some of the time, we get a HYPER_TASK_EMPTY response before the status + line, headers, and body have been read. Previously, that would cause us + to poll again, leading to a 1 second timeout. + + The HYPER_TASK_EMPTY docs say: + + The value of this task is null (does not imply an error). + + So, if we receive a HYPER_TASK_EMPTY, continue on with processing the + response. + + Reported-by: Kevin Burke + Fixes #7064 + Closes #7070 + +- [Ikko Ashimine brought this change] + + tool_getparam: fix comment typo in tool_getparam.c + + enfore -> enforce + + Closes #7074 + +- mem-include-scan.pl: require a non-word letter before memory funcs + + ... so that ldap_memfree() for example doesn't match the scan for free. + + Closes #7061 + +- version: free the openldap info correctly + + ... to avoid memory leaks. + + Follow-up to: bf0feae7768d9 + Closes #7061 + +- dupset: remove totally off comment + + Closes #7067 + +- configure: if asked for, fail if ldap is not found + + Reported-by: Jakub Zakrzewski + Fixes #7053 + Closes #7055 + +- version: add OpenLDAP version in the output + + Assisted-by: Howard Chu + Closes #7054 + +Jay Satiro (13 May 2021) +- [Joel Depooter brought this change] + + schannel: Ensure the security context request flags are always set + + As of commit 54e7475, these flags would only be set when using a new + credential handle. When re-using an existing credential handle, the + flags would not be set. + + Closes https://github.com/curl/curl/pull/7051 + +Dan Fandrich (12 May 2021) +- tests: Fix some tag matching issues in a number of tests + +Daniel Stenberg (12 May 2021) +- sasl: use 'unsigned short' to store mechanism + + ... saves a few bytes of struct size in memory and it only uses + 10 bits anyway. + + Closes #7045 + +- hostip: remove the debug code for LocalHost + + The Curl_resolv() had special code (when built in debug mode) for when + resolving the host name "LocalHost" (using that exact casing). It would + then get the host name from the --interface option instead. + + This development-only feature was not used by anything (anymore) and we + have the --resolve feature if we want to play similar tricks properly + going forward. + + Closes #7044 + +- progress: reset limit_size variables at transfer start + + Otherwise the old value would linger from a previous use and would mess + up the network speed cap logic. + + Reported-by: Ymir1711 on github + + Fixes #7042 + Closes #7043 + +- RELEASE-NOTES: synced + +- [Daniel Gustafsson brought this change] + + cookies: use CURLcode for cookie_output reporting + + Writing the cookie file has multiple error conditions, and was using an + int with magic numbers to report the different error (which in turn were + disregarded anyways). This moves reporting to use a CURLcode value. + + Lightly-touched-by: Daniel Stenberg + + Closes #7037 + Closes #6749 + +- [Daniel Gustafsson brought this change] + + cookies: make use of string duplication function + + strstore() is defined as a strdup which ensures to free the target + pointer before duping the source char * into it. Make use of it in + two more cases where it can simplify the code. + +- [Daniel Gustafsson brought this change] + + cookies: refactor comments + + Comments in the cookie code were a bit all over the place in terms of + style and wording. This takes a stab at cleaning them up by keeping to + a single style and overall shape. Some comments are moved a little and + some removed alltogether due to being redundant. No functional changes + have been made, + +- [Peng-Yu Chen brought this change] + + http2: skip immediate parsing of payload following protocol switch + + This is considered not harmful as a following http2_recv shall be + called very soon. + + This is considered helpful in the specific situation where some + servers (e.g. nghttpx v1.43.0) may fulfill stream 1 immediately + following the return of HTTP status 101, other than waiting for + the client-side connection preface to arrive. + + Fixes #7036 + Closes #7040 + +- [Peng-Yu Chen brought this change] + + http2: use nghttp2_session_upgrade2 instead of nghttp2_session_upgrade + + Following the upstream deprecation of nghttp2_session_upgrade. + + Also provides further checks for requests with the HEAD method. + + Closes #7041 + +- progress/trspeed: use a local convenient pointer to beautify code + + The function becomes easier to read and understand with less repetition. + +- trspeed: use long double for transfer speed calculation + +- progress: move transfer speed calc into function + + This silences two scan-build-11 warnings: "The result of the '/' + expression is undefined" + + Bug: https://curl.se/mail/lib-2021-05/0022.html + Closes #7035 + +- [Cameron Cawley brought this change] + + openssl: remove unneeded cast for CertOpenSystemStore() + + Closes #7025 + +- travis: disable the libssh build + + It can't run on focal and causes warnings on bionic. Since the focal + failure started rather suddenly a while ago, we can suspect it might be + temporary. + + Added "bring back the build" to the TODO document. + + Fixes #7011 + Closes #7012 + +- [Peng-Yu Chen brought this change] + + http: use calculated offsets inst of integer literals for header parsing + + Assumed to be a minor coding style improvement with no behavior change. + + A modern compiler is expected to have the calculation optimized during + compilation. It may be deemed okay even if that's not the case, since + the added overhead is considered very low. + + Closes #7032 + +- [Peng-Yu Chen brought this change] + + GIT-INFO: suggest using autoreconf instead of buildconf + + Follow-up to 85868537d + + Closes #7033 + +- http: deal with partial CONNECT sends + + Also added 'CURL_SMALLSENDS' to make Curl_write() send short packets, + which helped verifying this even more. + + Add test 363 to verify. + + Reported-by: ustcqidi on github + Fixes #6950 + Closes #7024 + +- HTTP3: make the ngtcp2 build use the quictls fork + + ... as ngtcp2 itself documents the build this way. + + Closes #7031 + +- http: limit the initial send amount to used upload buffer size + + Previously this logic would cap the send to CURL_MAX_WRITE_SIZE bytes, + but for the situations where a larger upload buffer has been set, this + function can benefit from sending more bytes. With default size used, + this does the same as before. + + Also changed the storage of the size to an 'unsigned int' as it is not + allowed to be set larger than 2M. + + Also added cautions to the man pages about changing buffer sizes in + run-time. + + Closes #7022 + +- RELEASE-NOTES: synced + +- ngtcp2: fix the cb_acked_stream_data_offset proto + + The 'datalen' value should be 64 bit, not size_t! + + Reported-by: Dmitry Karpov + Bug: https://curl.se/mail/lib-2021-05/0019.html + Closes #7027 + +- progress: when possible, calculate transfer speeds with microseconds + + ... this improves precision, especially for transfers in the few or even + sub millisecond range. + + Reported-by: J. Bromley + Fixes #7017 + Closes #7020 + +- http: reset the header buffer when sending the request + + A reused transfer handle could otherwise reuse the previous leftover + buffer and havoc would ensue. + + Reported-by: sergio-nsk on github + Fixes #7018 + Closes #7021 + +- curl_mprintf.3: add description + + These functions have existed in the API since the dawn of time. It is + about time we describe how they work, even if we discourage users from + using them. + + Closes #7010 + +- [Timothy Gu brought this change] + + URL-SYNTAX: update IDNA section for WHATWG spec changes + + WHATWG URL has dictated the use of Nontransitional Processing (IDNA + 2008) for several years now. Chrome (and derivatives) still use + Transitional Processing, but Firefox and Safari have both switched. + + Also document the fact that winidn functions differently from libidn2 + here. + + Closes #7026 + +- [Calvin Buckley brought this change] + + INSTALL: add IBM i specific quirks + + Fixes #6830 + Closes #7013 + +- libcurl.3: mention the URL API + + To make it easier to find. Also a minor polish of libcurl-url.3 + + Closes #7009 + +- GnuTLS: don't allow TLS 1.3 for versions that don't support it + + Follow-up to 781864bedbc5 + + ... as they don't understand it and will return error at us! + + Closes #7014 + +Kamil Dudka (6 May 2021) +- tool_getparam: handle failure of curlx_convert_tchar_to_UTF8() + + Reported by GCC analyzer: + + Error: GCC_ANALYZER_WARNING (CWE-476): + src/tool_getparam.c: scope_hint: In function 'parse_args' + src/tool_getparam.c:2318:38: warning[-Wanalyzer-possible-null-dereference]: dereference of possibly-NULL 'orig_opt' + lib/curlx.h:56: included_from: Included from here. + src/tool_getparam.c:28: included_from: Included from here. + lib/curl_multibyte.h:70:51: note: in definition of macro 'curlx_convert_tchar_to_UTF8' + src/tool_getparam.c:2316:16: note: in expansion of macro 'curlx_convert_tchar_to_UTF8' + + Reviewed-by: Marcel Raad + Reviewed-by: Daniel Stenberg + Closes #7023 + +Daniel Stenberg (6 May 2021) +- scripts/delta: also show total number of days + +Marc Hoersken (5 May 2021) +- sockfilt: fix invalid increment of handles index variable nfd + + Only increment the array index if we actually stored a handle. + + Follow up to e917492048f4b85a0fd58a033d10072fc7666c3b + Closes #6992 + +- sockfilt: avoid getting stuck waiting for writable socket + + Reset FD_WRITE event using the same approach as in multi.c + + Follow up to b36442b24305f3cda7c13cc64b46838995a4985b + Closes #6992 + +Jay Satiro (5 May 2021) +- test678: Fix for Windows multibyte builds + + Follow-up to 77fc385 from yesterday. + + Bug: https://github.com/curl/curl/pull/6662#issuecomment-832966557 + Reported-by: Marc Hörsken + +- [Dmitry Kostjuchenko brought this change] + + build: fix compilation for Windows UWP platform + + - Include afunix.h which is necessary for sockaddr_un when + USE_UNIX_SOCKETS is defined on Windows. + + Closes https://github.com/curl/curl/pull/7006 + +Daniel Stenberg (5 May 2021) +- gnutls: make setting only the MAX TLS allowed version work + + Previously, settting only the max allowed TLS version, leaving the + minimum one at default, didn't actually set it and left it to default + (TLS 1.3) too! + + As a bonus, this change also removes the dead code handling of SSLv3 + since that version can't be set anymore (since eff614fb0242cb). + + Reported-by: Daniel Carpenter + Fixes #6998 + Closes #7000 + +- openldap: replace ldap_ prefix on private functions + + Since openldap itself uses that prefix and with OpenĹDAP 2.5.4 (at + least) there's a symbol collision because of that. + + The private functions now use the 'oldap_' prefix where it previously + used 'ldap_'. + + Reported-by: 3eka on github + Fixes #7004 + Closes #7005 + +Jay Satiro (5 May 2021) +- http2: fix potentially uninitialized variable + + introduced several days ago in 3193170. caught by visual studio linker. + +- [Gilles Vollant brought this change] + + SSL: support in-memory CA certs for some backends + + - New options CURLOPT_CAINFO_BLOB and CURLOPT_PROXY_CAINFO_BLOB to + specify in-memory PEM certificates for OpenSSL, Schannel (Windows) + and Secure Transport (Apple) SSL backends. + + Prior to this change PEM certificates could only be imported from a file + and not from memory. + + Co-authored-by: moparisthebest@users.noreply.github.com + + Ref: https://github.com/curl/curl/pull/4679 + Ref: https://github.com/curl/curl/pull/5677 + Ref: https://github.com/curl/curl/pull/6109 + + Closes https://github.com/curl/curl/pull/6662 + +Daniel Stenberg (4 May 2021) +- [David Cook brought this change] + + tests: ignore case of chunked hex numbers in tests + + When hyper is used, it emits uppercase hexadecimal numbers for chunked + encoding lengths. Without hyper, lowercase hexadecimal numbers are used. + This change adds preprocessor statements to tests where this is an + issue, and adapts the fixtures to match. + + Closes #6987 + +- cmake: check for getppid and utimes + + ... as they're checked for in the configure script and are used by + source code. + + Removed checks for perror, setvbuf and strlcat since those defines are + not checked for in source code. + + Bonus: removed HAVE_STRLCPY from a few config-*.h files since that + symbol is not used in source code. + + Closes #6997 + +- libtest: remove lib530.c + + Follow up from e50a877df when test 530 was removed. Since then this + source file has not been used/needed. + + Closes #6999 + +- FILEFORMAT: mention sectransp as a feature + + Been supported since at least 40259ca65 + + Closes #7001 + +- RELEASE-NOTES: synced + +- libssh2: ignore timeout during disconnect + + ... to avoid memory leaks! + + libssh2 is tricky as we have to deal with the non-blockiness even in + close and shutdown cases. In the cases when we shutdown after a timeout + already expired, it is crucial that curl doen't let the timeout abort + the shutdown process as that then leaks memory! + + Reported-by: Benjamin Riefenstahl + Fixes #6990 + +- KNOWN_BUGS: add two HTTP/2 bugs + +- KNOWN_BUGS: add three HTTP/3 issues + + ... and moved the HTTP/2 issues to its own section + + Closes #6606 + Closes #6510 + Closes #6494 + +- [ejanchivdorj brought this change] + + CURLcode: add CURLE_SSL_CLIENTCERT + + When a TLS server requests a client certificate during handshake and + none can be provided, libcurl now returns this new error code + CURLE_SSL_CLIENTCERT + + Only supported by Secure Transport and OpenSSL for TLS 1.3 so far. + + Closes #6721 + +- [Tobias Gabriel brought this change] + + .github/FUNDING: add link to GitHub sponsors + + Closes #6985 + +- [Harry Sintonen brought this change] + + krb5/name_to_level: replace checkprefix with curl_strequal + + Closes #6993 + +- [Harry Sintonen brought this change] + + Curl_input_digest: require space after Digest + + Closes #6993 + +- [Harry Sintonen brought this change] + + Curl_http_header: check for colon when matching Persistent-Auth + + Closes #6993 + +- [Harry Sintonen brought this change] + + Curl_http_input_auth: require valid separator after negotiation type + + Closes #6993 + +- http: fix the check for 'Authorization' with Bearer + + The code would wrongly check for it using an additional colon. + + Reported-by: Blake Burkhart + Closes #6988 + +- [Kamil Dudka brought this change] + + http2: fix a resource leak in push_promise() + + ... detected by Coverity: + + Error: RESOURCE_LEAK (CWE-772): + lib/http2.c:532: alloc_fn: Storage is returned from allocation function "duphandle". + lib/http2.c:532: var_assign: Assigning: "newhandle" = storage returned from "duphandle(data)". + lib/http2.c:552: noescape: Resource "newhandle" is not freed or pointed-to in "set_transfer_url". + lib/http2.c:555: leaked_storage: Variable "newhandle" going out of scope leaks the storage it points to. + + Closes #6986 + +- [Kamil Dudka brought this change] + + http2: fix resource leaks in set_transfer_url() + + ... detected by Coverity: + + Error: RESOURCE_LEAK (CWE-772): + lib/http2.c:480: alloc_fn: Storage is returned from allocation function "curl_url". [Note: The source code implementation of the function has been overridden by a builtin model.] + lib/http2.c:480: var_assign: Assigning: "u" = storage returned from "curl_url()". + lib/http2.c:486: noescape: Resource "u" is not freed or pointed-to in "curl_url_set". [Note: The source code implementation of the function has been overridden by a builtin model.] + lib/http2.c:488: leaked_storage: Variable "u" going out of scope leaks the storage it points to. + + Error: RESOURCE_LEAK (CWE-772): + lib/http2.c:480: alloc_fn: Storage is returned from allocation function "curl_url". [Note: The source code implementation of the function has been overridden by a builtin model.] + lib/http2.c:480: var_assign: Assigning: "u" = storage returned from "curl_url()". + lib/http2.c:493: noescape: Resource "u" is not freed or pointed-to in "curl_url_set". [Note: The source code implementation of the function has been overridden by a builtin model.] + lib/http2.c:495: leaked_storage: Variable "u" going out of scope leaks the storage it points to. + + Error: RESOURCE_LEAK (CWE-772): + lib/http2.c:480: alloc_fn: Storage is returned from allocation function "curl_url". [Note: The source code implementation of the function has been overridden by a builtin model.] + lib/http2.c:480: var_assign: Assigning: "u" = storage returned from "curl_url()". + lib/http2.c:500: noescape: Resource "u" is not freed or pointed-to in "curl_url_set". [Note: The source code implementation of the function has been overridden by a builtin model.] + lib/http2.c:502: leaked_storage: Variable "u" going out of scope leaks the storage it points to. + + Error: RESOURCE_LEAK (CWE-772): + lib/http2.c:480: alloc_fn: Storage is returned from allocation function "curl_url". [Note: The source code implementation of the function has been overridden by a builtin model.] + lib/http2.c:480: var_assign: Assigning: "u" = storage returned from "curl_url()". + lib/http2.c:505: noescape: Resource "u" is not freed or pointed-to in "curl_url_get". [Note: The source code implementation of the function has been overridden by a builtin model.] + lib/http2.c:507: leaked_storage: Variable "u" going out of scope leaks the storage it points to. + + Closes #6986 + +- [Jacob Hoffman-Andrews brought this change] + + rustls: use ALPN + + Update required rustls to 0.5.0 + + Closes #6960 + +- [Michał Antoniak brought this change] + + gskit: fix CURL_DISABLE_PROXY build + + Removed localfd and remotefd from ssl_backend_data (ued only with proxy + connection). Function pipe_ssloverssl return always 0, when proxy is not + used. + + Closes #6981 + +- [Michał Antoniak brought this change] + + gskit: fix undefined reference to 'conn' + + Closes #6980 + +- [Jacob Hoffman-Andrews brought this change] + + tls: add USE_HTTP2 define + + This abstracts across the two HTTP/2 backends: nghttp2 and Hyper. + + Add our own define for the "h2" ALPN protocol, so TLS backends can use + it without depending on a specific HTTP backend. + + Closes #6959 + +- [Jacob Hoffman-Andrews brought this change] + + lib: fix 0-length Curl_client_write calls + + Closes #6954 + +- [Jacob Hoffman-Andrews brought this change] + + lib: remove strlen call from Curl_client_write + + At all call sites with an explicit 0 len, pass an appropriate nonzero + len. + + Closes #6954 + +- [Ayushman Singh Chauhan brought this change] + + docs: camelcase it like GitHub everywhere + + Closes #6979 + +Jay Satiro (27 Apr 2021) +- [Lucas Servén Marín brought this change] + + docs: fix typo in fail-with-body doc + + This commit fixes a small typo in the documentation for the + --fail-with-body flag. + + Closes https://github.com/curl/curl/pull/6977 + +- lib: fix some misuse of curlx_convert_UTF8_to_tchar + + curlx_convert_UTF8_to_tchar must be freed by curlx_unicodefree, but + prior to this change some uses mistakenly called free. + + I've reviewed all other uses of curlx_convert_UTF8_to_tchar and + curlx_convert_tchar_to_UTF8. + + Bug: https://github.com/curl/curl/pull/6602#issuecomment-825236763 + Reported-by: sergio-nsk@users.noreply.github.com + + Closes https://github.com/curl/curl/pull/6938 + +Daniel Stenberg (27 Apr 2021) +- ntlm: precaution against super huge type2 offsets + + ... which otherwise caused an integer overflow and circumvented the if() + conditional size check. + + Detected by OSS-Fuzz + Bug: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=33720 + Assisted-by: Max Dymond + Closes #6975 + +- c-hyper: fix unused variable ‘wrote’ + +- libcurl-security.3: be careful of setuid + + Reported-by: Harry Sintonen + Closes #6970 + +- [Kevin Burke brought this change] + + c-hyper: don't write to set.writeheader if null + + Previously if a caller set CURLOPT_WRITEFUNCTION but did not set a + CURLOPT_HEADERDATA buffer, Hyper would still attempt to write headers to + the data->set.writeheader header buffer, even though it is null. This + led to NPE segfaults attempting to use libcurl+Hyper with Git, for + example. + + Instead, process the client write for the status line using the same + logic we use to process the client write for the later HTTP headers, + which contains the appropriate guard logic. As a side benefit, + data->set.writeheader is now only read in one file instead of two. + + Fixes #6619 + Fixes abetterinternet/crustls#49 + Fixes hyperium/hyper#2438 + Closes #6971 + +- wolfssl: handle SSL_write() returns 0 for error + + Reported-by: Timo Lange + + Closes #6967 + +- easy: ignore sigpipe in curl_easy_send + + Closes #6965 + +- sigpipe: ignore SIGPIPE when using wolfSSL as well + + Closes #6966 + +- libcurl-security.3: don't try to filter IPv4 hosts based on the URL + + Closes #6942 + +- [Harry Sintonen brought this change] + + nss_set_blocking: avoid static for sock_opt + + Reviewed-by: Kamil Dudka + Closes #6945 + +- RELEASE-NOTES: synced + +- [Yusuke Nakamura brought this change] + + docs/HTTP3.md: fix nghttp2's HTTP/3 server port + + Port 8443 does not work now. + Correct origin is in the quicwg's wiki. + https://github.com/quicwg/base-drafts/wiki/Implementations#ngtcp2 + + Closes #6964 + +- krb5: don't use 'static' to store PBSZ size response + + ... because it makes the knowledge and usage cross-transfer in funny and + unexpected ways. + + Reported-by: Harry Sintonen + Closes #6963 + +- [Kevin Burke brought this change] + + m4: add security frameworks on Mac when compiling rustls + + Previously compiling rustls on Mac would only complete if you also + compiled the SecureTransport TLS backend, which curl would prefer to + the Rust backend. + + Appending these flags to LDFLAGS makes it possible to compile the + Rustls backend on Mac without the SecureTransport backend, which means + this patch will make it possible for Mac users to use the Rustls + backend for TLS. + + Reviewed-by: Jacob Hoffman-Andrews + + Fixes #6955 + Cloes #6956 + +- krb5: remove the unused 'overhead' function + + Closes #6947 + +- [Johann150 brought this change] + + curl_url_set.3: add memory management information + + wording taken from man page for CURLOPT_URL.3 + + As far as I can see, the URL part is either malloc'ed before due to + encoding or it is strdup'ed. + + Closes #6953 + +- [Jacob Hoffman-Andrews brought this change] + + c-hpyer: fix handling of zero-byte chunk from hyper + + Closes #6951 + +- CURLOPT_POSTFIELDS.3: clarify how it gets the size of the data + + Ref: https://curl.se/mail/lib-2021-04/0085.html + Closes #6943 + +- [Ralph Langendam brought this change] + + cmake: make libcurl output filename configurable + + Reviewed-by: Jakub Zakrzewski + Closes #6933 + +- [Patrick Monnerat brought this change] + + vtls: reset ssl use flag upon negotiation failure + + Fixes the segfault in ldaps disconnect. + + Reported-by: Illarion Taev + Fixes #6934 + Closes #6937 + +- configure: fix typo in TLS error message + + Reported-by: Pontus Lundkvist + +- README: link to the commercial support option + +Jay Satiro (22 Apr 2021) +- [Martin Halle brought this change] + + version: add gsasl_version to curl_version_info_data + + - Add gsasl_version string and bump to CURLVERSION_TENTH. + + Ref: https://curl.se/mail/lib-2021-04/0003.html + + Closes https://github.com/curl/curl/pull/6843 + +- [Morten Minde Neergaard brought this change] + + schannel: Support strong crypto option + + - Support enabling strong crypto via optional user cipher list when + USE_STRONG_CRYPTO or SCH_USE_STRONG_CRYPTO is in the list. + + MSDN says SCH_USE_STRONG_CRYPTO "Instructs Schannel to disable known + weak cryptographic algorithms, cipher suites, and SSL/TLS protocol + versions that may be otherwise enabled for better interoperability." + + Ref: https://curl.se/mail/lib-2021-02/0066.html + Ref: https://curl.se/docs/manpage.html#--ciphers + Ref: https://curl.se/libcurl/c/CURLOPT_SSL_CIPHER_LIST.html + Ref: https://docs.microsoft.com/en-us/windows/win32/api/schannel/ns-schannel-schannel_cred + + Closes https://github.com/curl/curl/pull/6734 + +Daniel Stenberg (22 Apr 2021) +- RELEASE-NOTES: synced + +- ci: adapt to configure requiring an explicit TLS choice + +- configure: split out each TLS library detector into its own function + + ... and put those functions in separate m4 files per TLS library. + +- configure: make the TLS library choice(s) explicit + + configure no longer tries to find a TLS library by default, but all + libraries are now equal: the user needs to explicitly ask what TLS + library or libraries to use. + + If no TLS library is selected, configure will error out unless + --without-ssl is explicitly used to request a built without TLS (as that + is very rare these days). + + Removes: --with-winssl, --with-darwinssl and all --without-* options for + TLS libraries. + + Closes #6897 + +- tests/disable-scan.pl: also scan all m4 files + + Fixes test 1165 when functions are moved from configure.ac to files in + m4/ + +Jay Satiro (22 Apr 2021) +- schannel: Disable auto credentials; add an option to enable it + + - Disable auto credentials by default. This is a breaking change + for clients that are using it, wittingly or not. + + - New libcurl ssl option value CURLSSLOPT_AUTO_CLIENT_CERT tells libcurl + to automatically locate and use a client certificate for + authentication, when requested by the server. + + - New curl tool options --ssl-auto-client-cert and + --proxy-ssl-auto-client-cert map to CURLSSLOPT_AUTO_CLIENT_CERT. + + This option is only supported for Schannel (the native Windows SSL + library). Prior to this change Schannel would, with no notification to + the client, attempt to locate a client certificate and send it to the + server, when requested by the server. Since the server can request any + certificate that supports client authentication in the OS certificate + store it could be a privacy violation and unexpected. + + Fixes https://github.com/curl/curl/issues/2262 + Reported-by: Jeroen Ooms + Assisted-by: Wes Hinsley + Assisted-by: Rich FitzJohn + + Ref: https://curl.se/mail/lib-2021-02/0066.html + Reported-by: Morten Minde Neergaard + + Closes https://github.com/curl/curl/pull/6673 + +Daniel Stenberg (22 Apr 2021) +- [Michał Antoniak brought this change] + + vtls: deduplicate some DISABLE_PROXY ifdefs + + continue from #5735 + + - using SSL_HOST_NAME, SSL_HOST_DISPNAME, SSL_PINNED_PUB_KEY for other + tls backend + + - create SSL_HOST_PORT + + Closes #6660 + +Jay Satiro (22 Apr 2021) +- OS400: fix typo + + CURLVERSION_HEIGHTH -> CURLVERSION_EIGHTH + +Daniel Stenberg (22 Apr 2021) +- checksrc: complain on == NULL or != 0 checks in conditions + + ... to make them all consistenly use if(!var) and if(var) + + Also added a few missing warnings to the documentation. + + Closes #6912 + +- tidy-up: make conditional checks more consistent + + ... remove '== NULL' and '!= 0' + + Closes #6912 + +- [Patrick Monnerat brought this change] + + vauth: factor base64 conversions out of authentication procedures + + Input challenges and returned messages are now in binary. + Conversions from/to base64 are performed by callers (currently curl_sasl.c + and http_ntlm.c). + + Closes #6654 + +- [Patrick Monnerat brought this change] + + bufref: buffer reference support + + A struct bufref holds a buffer pointer, a data size and a destructor. + When freed or its contents are changed, the previous buffer is implicitly + released by the associated destructor. The data size, although not used + internally, allows binary data support. + + A unit test checks its handling methods: test 1661 + + Closes #6654 + +- [Patrick Monnerat brought this change] + + os400: additional support for options metadata + + New functions curl_easy_option_by_name_ccsid() and + curl_easy_option_get_name_ccsid() allows accessing metadata in alternate + character encoding. + + This commit also updates curl_version_info_ccsid() to handle info version 9 + and adds recent definitions to the ILE/RPG include file. + + Documentation updated accordingly. + + Reviewed-by: Jon Rumsey + Closes #6574 + +- [Patrick Monnerat brought this change] + + test server: take care of siginterrupt() deprecation + + Closes #6529 + +Marc Hoersken (21 Apr 2021) +- lib1564.c: enable last wakeup test part on Windows + + Suggested-by: Gergely Nagy + Reviewed-by: Jay Satiro + Reviewed-by: Marcel Raad + + Closes #6245 + +- multi: fix slow write/upload performance on Windows + + Reset FD_WRITE by sending zero bytes which is permissible + and will be treated by implementations as successful send. + + Without this we won't be notified in case a socket is still + writable if we already received such a notification and did + not send any data afterwards on the socket. This would lead + to waiting forever on a writable socket being writable again. + + Assisted-by: Tommy Odom + Reviewed-by: Jay Satiro + Reviewed-by: Marcel Raad + Tested-by: tmkk on github + + Bug: #6146 + Closes #6245 + +- multi: reduce Win32 API calls to improve performance + + 1. Consolidate pre-checks into a single Curl_poll call: + + This is an attempt to restructure the code in Curl_multi_wait + in such a way that less syscalls are made by removing individual + calls to Curl_socket_check via SOCKET_READABLE/SOCKET_WRITABLE. + + 2. Avoid resetting the WinSock event multiple times: + + We finally call WSAResetEvent anyway, so specifying it as + an optional parameter to WSAEnumNetworkEvents is redundant. + + 3. Wakeup directly in case no sockets are being monitoring: + + Fix the WinSock based implementation to skip extra waiting by + not sleeping in case no sockets are to be waited on and just + the WinSock event is being monitored for wakeup functionality. + + Assisted-by: Tommy Odom + Reviewed-by: Jay Satiro + Reviewed-by: Marcel Raad + + Bug: #6146 + Closes #6245 + +- Revert "Revert 'multi: implement wait using winsock events'" + + This reverts commit 2260e0ebe6d45529495231b3e37a0c58fb92a6a2, + also restoring previous follow up changes which were reverted. + + Authored-by: rcombs on github + Authored-by: Marc Hörsken + Reviewed-by: Jay Satiro + Reviewed-by: Marcel Raad + + Restores #5634 + Reverts #6281 + Part of #6245 + +Daniel Stenberg (21 Apr 2021) +- Revert "cmake: make libcurl library output name configurable" + + This reverts commit 1cba36d2166c396f987eea587cf92671b27acb92. + + CMake provides properties that can be set on a target to rename the + output artifact without changing the name of a target. + + Ref: #6899 + +- [Michael Kolechkin brought this change] + + sectransp: allow cipher name to be specified + + Add parser for CURLOPT_SSL_CIPHER_LIST option for Secure Transport (ST) + back-end. Similar to NSS and GSKit back-ends, new code parses string + value and configures ST library to use those ciphers for communication. + Create cipher spec data structure and initialize the array of specs with + cipher number, name, alias, and 'weak' flag. + + Mark triple-DES ciphers as 'weak', and exclude them from the default + ciphers list. + + Closes #6464 + +- [Michael Kolechkin brought this change] + + NSS: add ciphers to map + + Add cipher names to the `cipherlist` map, based on the list of ciphers + implemented by the NSS in the source code file + https://github.com/nss-dev/nss/blob/master/lib/ssl/sslenum.c + + Closes #6670 + +- http2: remove DEBUG_HTTP2 + + Accidentally committed in 605e84235 + +- [Ralph Langendam brought this change] + + cmake: make libcurl library output name configurable + + Closes #6899 + +- sws: #ifdef S_IFSOCK use + + SCO OpenServer 5.0.7 does not define S_IFSOCK. + + Reported-by: Kevin R. Bulgrien + Bug: https://curl.se/mail/lib-2021-04/0074.html + Closes #6926 + +- curl_setup: provide the shutdown flags wider + + By using #ifdef on the symbol names to work on anything that don't + provide them. SCO OpenServer 5.0.7, sys/socket.h does not define either + SHUT_RDWR, SHUT_RD, and SHUT_WR. + + Reported-by: Kevin R. Bulgrien + Bug: https://curl.se/mail/lib-2021-04/0073.html + Closes #6925 + +- connect: use CURL_SA_FAMILY_T for portability + + Reported-by: Kevin R. Bulgrien + Bug: https://curl.se/mail/lib-2021-04/0071.html + + Closes #6918 + +- urlapi: make sure no +/- signs are accepted in IPv4 numericals + + Follow-up to 56a037cc0ad1b2. Extends test 1560 to verify. + + Reported-by: Tuomas Siipola + Fixes #6916 + Closes #6917 + +- ConnectionExists: respect requests for h1 connections better + + ... for situations when multiplexing isn't enabled on the h2 connection + and h1 is explicitly requested for the transfer. + + Assisted-by: Gergely Nagy + +- multi: don't close connection HTTP_1_1_REQUIRED + + The ConnectionExists() function will note that the new transfer wants + less then h2 and that it can't multiplex it and therefor opt to open a + new connection instead. + +- http2: move the stream error field to the per-transfer storage + + Storing a stream error in the per-connection struct was an error that lead to + race conditions as subsequent stream handling could overwrite the error code + before it was used for the stream with the actual problem. + + Closes #6910 + +- http2: call the handle-closed function correctly on closed stream + + This was this one condition where the stream could be closed due to an + error and the function would still wrongly just return 0 for it. + + Reported-by: Gergely Nagy + Fixes #6862 + Closes #6910 + +- test1660: check the created HSTS file as text mode + + Closes #6922 + +- RELEASE-NOTES: synced + +- test 493: require https in curl to run + + Closes #6927 + +Jay Satiro (20 Apr 2021) +- tool_operate: don't discard failed parallel transfer result + + - Save a parallel transfer's result code only when it fails and the + transfer is not being retried. + + Prior to this change the result code was always set which meant that a + failed result could be erroneously discarded if a different transfer + later had a successful result (CURLE_OK). + + Before: + + > curl --fail -Z https://httpbin.org/status/404 https://httpbin.org/delay/10 + > echo %ERRORLEVEL% + 0 + + After: + + > curl --fail -Z https://httpbin.org/status/404 https://httpbin.org/delay/10 + > echo %ERRORLEVEL% + 22 + + Closes #xxxx + +- [Georeth Zhou brought this change] + + openssl: fix build error with OpenSSL < 1.0.2 + + Closes https://github.com/curl/curl/pull/6920 + +Viktor Szakats (19 Apr 2021) +- README.md: delete Codacy UTM parameters & follow permanent redirect [ci skip] + + UTM parameters leak referrer and various marketing/tracking information + even if these would normally be stripped by website or client policy. + This link also works fine without them. Also took the opportunity to + update the URL to the one pointed to by the previous one via permanent + redirect. + + Reviewed-by: Daniel Stenberg + Closes #6919 + +Daniel Stenberg (19 Apr 2021) +- urlapi: "normalize" numerical IPv4 host names + + When the host name in a URL is given as an IPv4 numerical address, the + address can be specified with dotted numericals in four different ways: + a32, a.b24, a.b.c16 or a.b.c.d and each part can be specified in + decimal, octal (0-prefixed) or hexadecimal (0x-prefixed). + + Instead of passing on the name as-is and leaving the handling to the + underlying name functions, which made them not work with c-ares but work + with getaddrinfo, this change now makes the curl URL API itself detect + and "normalize" host names specified as IPv4 numericals. + + The WHATWG URL Spec says this is an okay way to specify a host name in a + URL. RFC 3896 does not allow them, but curl didn't prevent them before + and it seems other RFC 3896-using tools have not either. Host names used + like this are widely supported by other tools as well due to the + handling being done by getaddrinfo and friends. + + I decided to add the functionality into the URL API itself so that all + users of these functions get the benefits, when for example wanting to + compare two URLs. Also, it makes curl built to use c-ares now support + them as well and make curl builds more consistent. + + The normalization makes HTTPS and virtual hosted HTTP work fine even + when curl gets the address specified using one of the "obscure" formats. + + Test 1560 is extended to verify. + + Fixes #6863 + Closes #6871 + +- libssh: fix "empty expression statement has no effect" warnings + + ... by fixing macros to do-while constructs and moving out the calls to + "break" outside of the actual macro. It also fixes the problem where the + macro was used witin a loop and the break didn't do right. + + Reported-by: Emil Engler + Fixes #6847 + Closes #6909 + +- hsts: enable by default + + No longer considered experimental. + + Closes #6700 + +- vtls: refuse setting any SSL version + + ... previously they were supported if a TLS library would (unexpectedly) + still support them, but from this change they will be refused already in + curl_easy_setopt(). SSLv2 and SSLv3 have been known to be insecure for + many years now. + + Closes #6773 + +- curl: ignore options asking for SSLv2 or SSLv3 + + Instead output a warning about it and continue with the defaults. + + These SSL versions are typically not supported by the TLS libraries since a + long time back already since they are inherently insecure and broken. Asking + for them to be used will just cause an error to be returned slightly later. + + In the unlikely event that a user's TLS library actually still supports these + protocol versions, this change might make the request a little less insecure. + + Closes #6772 + +- test972: verify the json output with jsonlint + + Make sure one of the azure jobs has jsonlint installed so that the test + runs there. + + Ref: #6905 + +- [Jay Satiro brought this change] + + tool_writeout: fix the HTTP_CODE json output + + Update test 970 accordingly. + + Reported-by: Michal Rus + Fixes #6905 + Closes #6906 + +- openldap: protect SSL-specific code with proper #ifdef + + Closes #6901 + +- libssh2: fix Value stored to 'sshp' is never read + + Pointed out by scan-build + + Closes #6900 + +- [Victor Vieux brought this change] + + tool_getparam: replace (in-place) '%20' by '+' according to RFC1866 + + Signed-off-by: Victor Vieux + + Closes #6895 + +- configure: provide --with-openssl, deprecate --with-ssl + + Makes the option more explicit. + + Closes #6887 + +- RELEASE-NOTES: synced + + and bumped curlver to 7.77.0 + +- [Javier Blazquez brought this change] + + rustls: only return CURLE_AGAIN when TLS session is fully drained + + The code in cr_recv was returning prematurely as soon as the socket + reported no more data to read. However, this could be leaving some + unread plaintext data in the rustls session from a previous call, + causing causing the transfer to hang if the socket never receives + further data. + + We need to ensure that the session is fully drained of plaintext data + before returning CURLE_AGAIN to the caller. + + Reviewed-by: Jacob Hoffman-Andrews + Closes #6894 + +- cookie: CURLOPT_COOKIEFILE set to NULL switches off cookies + + Add test 676 to verify that setting CURLOPT_COOKIEFILE to NULL again clears + the cookiejar from memory. + + Reported-by: Stefan Karpinski + Fixes #6889 + Closes #6891 + +Version 7.76.1 (14 Apr 2021) + +Daniel Stenberg (14 Apr 2021) +- RELEASE-NOTES: synced + + curl 7.76.1 release + +- THANKS: add names from 7.76.1 + +- misc: update copyright year ranges to match latest updates + +- [Tatsuhiro Tsujikawa brought this change] + + ngtcp2: Use ALPN h3-29 for now + + Fixes #6864 + Cloes #6886 + +Jay Satiro (11 Apr 2021) +- TODO: remove 18.22 --fail-with-body + + --fail-with-body was added in 8a964cb (precedes curl-7_76_0). + +Daniel Stenberg (10 Apr 2021) +- [Jürgen Gmach brought this change] + + src/tool_vms.c: remove duplicated word in comment + + Closes #6881 + +- configure: fix CURL_DARWIN_CFLAGS use + + The macro name change was not completely done. + + Follow-up to 5d2c384452543c + Bug: https://github.com/curl/curl/commit/5d2c384452543c7b6c9fb02eaa0afc84fd5ab941#commitcomment-49315187 + Reported-by: Marcel Raad + Closes #6878 + +- [Anthony Shaw brought this change] + + github/workflow: add "security-extended" to codeql-analysis.yml + + Extends the CodeQL code scan. + + Closes #6815 + +- [Jochem Broekhoff brought this change] + + examples/hiperfifo.c: check event_initialized before delete + + If event_del is called with the event struct (still) zeroed out, a + segmentation fault may occur. event_initialized checks whether the + event struct is nonzero. + + Closes #6876 + +- [Patrick Monnerat brought this change] + + ntlm: fix negotiated flags usage + + According to Microsoft document MS-NLMP, current flags usage is not + accurate: flag NTLMFLAG_NEGOTIATE_NTLM2_KEY controls the use of + extended security in an NTLM authentication message and NTLM version 2 + cannot be negotiated within the protocol. + + The solution implemented here is: if the extended security flag is set, + prefer using NTLM version 2 (as a server featuring extended security + should also support version 2). If version 2 has been disabled at + compile time, use extended security. + + Tests involving NTLM are adjusted to this new behavior. + + Fixes #6813 + Closes #6849 + +- [Patrick Monnerat brought this change] + + ntlm: support version 2 on 32-bit platforms + + Closes #6849 + +- [Patrick Monnerat brought this change] + + curl_ntlm_core.h: simplify conditionals for USE_NTLM2SESSION + + ... as !defined(CURL_DISABLE_CRYPTO_AUTH) is a prerequisite for the + whole NTLM. + + Closes #6849 + +- lib: remove unused HAVE_INET_NTOA_R* defines + + Closes #6867 + +- [Michael Forney brought this change] + + configure: include unconditionally + + In 2682e5f5, several instances of AC_HEADER_TIME were removed since + it is a deprecated autoconf macro. However, this was the macro that + defined TIME_WITH_SYS_TIME, which was used to indicate that + can be included alongside . TIME_WITH_SYS_TIME is still + used in the configure test body and since it is no longer defined, + is *not* included on systems that have . + + In particular, at least on musl libc and glibc, does + not implicitly include and does not declare clock_gettime, + gmtime_r, or localtime_r. This causes configure to fail to detect + those functions. + + The AC_HEADER_TIME macro deprecation text says + + > All current systems provide time.h; it need not be checked for. + > Not all systems provide sys/time.h, but those that do, all allow + > you to include it and time.h simultaneously. + + So, to fix this issue, simply include unconditionally when + testing for time-related functions and in libcurl, and don't bother + checking for it. + + Closes #6859 + +- [Michael Forney brought this change] + + configure: remove use of RETSIGTYPE + + This was previously defined by the obsolete AC_TYPE_SIGNAL macro, + which was removed in 2682e5f5. The deprecation text says + + > Your code may safely assume C89 semantics that RETSIGTYPE is void. + + So, remove it and just use void instead. + + Closes #6861 + +- [Muhammed Yavuz Nuzumlalı brought this change] + + install: add instructions for Apple Darwin platforms + + Closes #6860 + +- [Muhammed Yavuz Nuzumlalı brought this change] + + configure: disable min version set for Darwin + + Fixes #6838 + Closes #6860 + +- [David Hu brought this change] + + docs/HTTP3.md: update the build instruction using gnutls + + In ngtcp2 the `with-gnutls` option is disabled by default, which will + cause `curl` unable to be `make` because of lacking the libraries + needed. + + Closes #6857 + +- RELEASE-NOTES: synced + +- typecheck-gcc: make the ssl-ctx-cb check use SSL_CTX pointers + + ... and not values. + + Reported-by: locpyl-tidnyd on github + Fixes #6818 + Closes #6819 + +- ngtcp2+gnutls: clear credentials when freed + + ... to avoid double-free. + + Reported-by: Kenneth Davidson + Fixes #6824 + Closes #6856 + +Jay Satiro (5 Apr 2021) +- [Cherish98 brought this change] + + tool_progress: Fix progress meter in parallel mode + + Make sure the total amount of DL/UL bytes are counted before the + transfer finalizes. Otherwise if a transfer finishes too quick, its + total numbers are not added, and results in a DL%/UL% that goes above + 100%. + + Detail: + + progress_meter() is called periodically, and it may not catch a + transfer's total bytes if the value was unknown during the last call, + and the transfer is finished and deleted (i.e., lost) during the next + call. + + Closes https://github.com/curl/curl/pull/6840 + +- [Emil Engler brought this change] + + libssh: get rid of PATH_MAX + + This removes the last occurrence of PATH_MAX inside our libssh + implementation by calculating the path length from the string length of + the two components. + + Closes #6829 + +Daniel Stenberg (5 Apr 2021) +- http_proxy: only loop on 407 + close if we have credentials + + ... to fix the retry-loop. + + Add test 718 to verify. + + Reported-by: Daniel Kurečka + Fixes #6828 + Closes #6850 + +- h2: allow 100 streams by default + + instead of 13, before the server has told how many streams it + accepts. The server can always reject new streams anyway if we go above + what it accepts. + + Ref: #6826 + Closes #6852 + +- [Luke Granger-Brown brought this change] + + file: support GETing directories again + + After 957bc1881e686f9714c4e6a01bf33535091f0e21, we no longer compute an + expected_size for directories. This has the upshot that when we compare + even an empty Range with the available size, we fail. + + This brings back the previous behaviour, which was to succeed, but with + empty content. This also removes the "Accept-ranges: bytes" header, + which is nonsensical on directories. + + Adds test 3016 + Fixes #6845 + Closes #6846 + +- RELEASE-NOTES: synced + + and bumped to 7.76.1 + +- TLS: fix HTTP/2 selection + + for GnuTLS, BearSSL, mbedTLS, NSS, SChannnel, Secure Transport and + wolfSSL... + + Regression since 88dd1a8a115b1f5ece (shipped in 7.76.0) + Reported-by: Kenneth Davidson + Reported-by: romamik om github + Fixes #6825 + Closes #6827 + +Jay Satiro (2 Apr 2021) +- hostip: Fix for builds that disable all asynchronous DNS + + - Define Curl_resolver_error function only when USE_CURL_ASYNC. + + Prior to this change building curl without an asynchronous resolver + backend (c-ares or threaded) and without DoH (DNS-over-HTTPS, which is + also asynchronous but independent of resolver backend) would cause a + build error since Curl_resolver_error is called by and evaluates + variables only available in asynchronous builds. + + Reported-by: Benbuck Nason + + Fixes https://github.com/curl/curl/issues/6831 + Closes https://github.com/curl/curl/pull/6832 + +Daniel Stenberg (31 Mar 2021) +- [Gilles Vollant brought this change] + + openssl: Fix CURLOPT_SSLCERT_BLOB without CURLOPT_SSLCERT_KEY + + Reported-by: Christian Schmitz + Fixes #6816 + Closes #6820 + +Version 7.76.0 (31 Mar 2021) + +Daniel Stenberg (31 Mar 2021) +- RELEASE-NOTES: synced + + curl 7.76.0 release + +- THANKS: added names from 7.76.0 + +- CURLOPT_AUTOREFERER.3: clarify that it sets the full URL + + ... some users may not want that! + +- define: remove CURL_DISABLE_NTLM ifdefs + + It was never defined anywhere. Fixed disable-scan (test 1165) to also + scan headers, which found this issue. + + Closes #6809 + +- vtls: fix addsessionid for non-proxy builds + + Follow-up to b09c8ee15771c61 + Fixes #6812 + Closes #6811 + +- [Li Xinwei brought this change] + + cmake: support WinIDN + + Closes #6807 + +- transfer: clear 'referer' in declaration + + To silence (false positive) compiler warnings about it. + + Follow-up to 7214288898f5625 + + Reviewed-by: Marcel Raad + Closes #6810 + +- [Marc Hoersken brought this change] + + config: fix SSPI enabling NTLM if crypto auth is disabled + + Avoid enabling NTLM feature based upon Windows SSPI + being enabled in case that crypto auth is disabled. + + Reported-by: Marcel Raad + + Follow-up to #6277 + Fixes #6803 + Closes #6808 + +- HISTORY: add two 2021 events + +- vtls: add 'isproxy' argument to Curl_ssl_get/addsessionid() + + To make sure we set and extract the correct session. + + Reported-by: Mingtao Yang + Bug: https://curl.se/docs/CVE-2021-22890.html + + CVE-2021-22890 + +- [Viktor Szakats brought this change] + + transfer: strip credentials from the auto-referer header field + + Added test 2081 to verify. + + CVE-2021-22876 + + Bug: https://curl.se/docs/CVE-2021-22876.html + +- curl_sasl: fix compiler error with --disable-crypto-auth + + ... if libgsasl was found. + + Closes #6806 + +- [Patrick Monnerat brought this change] + + ldap: only set the callback ptr for TLS context when TLS is used + + Follow-up to a5eee22e594c2460f + Fixes #6804 + Closes #6805 + +- copyright: update copyright year ranges to 2021 + + Reviewed-by: Emil Engler + Closes #6802 + +- send_speed: simplify the checks for if a speed limit is set + + ... as we know the value cannot be set to negative: enforced by + setopt() + +- http: cap body data amount during send speed limiting + + By making sure never to send off more than the allowed number of bytes + per second the speed limit logic is given more room to actually work. + + Reported-by: Fabian Keil + Bug: https://curl.se/mail/lib-2021-03/0042.html + Closes #6797 + +- urldata: merge "struct DynamicStatic" into "struct UrlState" + + Both were used for the same purposes and there was no logical separation + between them. Combined, this also saves 16 bytes in less holes in my + test build. + + Closes #6798 + +- tests/README.md: mentioned that en_US.UTF-8 is required + + Reported-by: Oumph on github + Fixes #6768 + +- HISTORY: fixed the Mac OS X 10.1 release date + + Based on what Wikipedia says + +Jay Satiro (26 Mar 2021) +- examples: Remove threaded-shared-conn.c due to bug + + Known bug 11.11 is the shared object's connection cache is not thread + safe, so we should not have an example for it. + + Ref: https://github.com/curl/curl/issues/4915 + Ref: https://curl.se/docs/knownbugs.html#A_shared_connection_cache_is_not + + Closes https://github.com/curl/curl/pull/6795 + +- KNOWN_BUGS: Update 11.9 - DoH option inheritance + + - Add description: Explain that some options aren't inherited because + they are not relevant for the DoH SSL connections or may result in + unexpected behavior. + + - Remove the reference to #4578 (SSL verify options not inherited) since + that was fixed by #6597 (separate DoH-specific options for verify). + + - Explain that DoH-specific options (those created by #6597) are + available: CURLOPT_DOH_SSL_VERIFYHOST, CURLOPT_DOH_SSL_VERIFYPEER and + CURLOPT_DOH_SSL_VERIFYSTATUS. + + - Add a reference to #6605 and explain that the user's debug function is + not inherited because it would be unexpected to pass internal handles + (ie DoH handles) to the user's callback. + + Closes https://github.com/curl/curl/issues/6605 + +Daniel Stenberg (26 Mar 2021) +- curl_easy_setopt.3: add curl_easy_option* functions to SEE ALSO + +- [Jean-Philippe Menil brought this change] + + openssl: ensure to check SSL_CTX_set_alpn_protos return values + + SSL_CTX_set_alpn_protos() return 0 on success, and non-0 on failure + + Signed-off-by: Jean-Philippe Menil + + Closes #6794 + +- multi: close the connection when h2=>h1 downgrading + + Otherwise libcurl is likely to reuse the connection again in the next + attempt since the connection reuse logic doesn't take downgrades into + account. + + Reported-by: Anthony Ramine + Fixes #6788 + Closes #6793 + +- openssl: set the transfer pointer for logging early + + Otherwise, the transfer will be NULL in the trace function when the + early handshake details arrive and then curl won't show them. + + Regresssion in 7.75.0 + + Reported-by: David Hu + Fixes #6783 + Closes #6792 + +- RELEASE-NOTES: synced + +- TODO: Custom progress meter update interval + + Ref: https://stackoverflow.com/q/66789977/93747 + +- docs/ABI: tighten up the language + + Make the promises more firm + + Closes #6786 + +- openldap: disconnect better + + Instead of clearing the callback argument in disconnect, set it to the + (new) transfer to make sure the correct data is passed to the callbacks. + + Follow-up to e467ea3bd937f38 + Assisted-by: Patrick Monnerat + Closes #6787 + +- libssh2: kdb_callback: get the right struct pointer + + After the recent conn/data refactor in this source file, this function + was mistakenly still getting the old struct pointer which would lead to + crash on servers with keyboard-interactive auth enabled. + + Follow-up to a304051620b92e12b (shipped in 7.75.0) + + Reported-by: Christian Schmitz + Fixes #6691 + Closes #6782 + +- tftp: remove unused struct fields + + Follow-up to d3d90ad9c00530d + + Closes #6781 + +- openldap: avoid NULL pointer dereferences + + Follow-up to a59c33ceffb8f78 + Reported-by: Patrick Monnerat + Fixes #6676 + Closes #6780 + +- http: strip default port from URL sent to proxy + + To make sure the Host: header and the URL provide the same authority + portion when sent to the proxy, strip the default port number from the + URL if one was provided. + + Reported-by: Michael Brown + Fixes #6769 + Closes #6778 + +- azure: disable test 433 on azure-ubuntu + + Something in that environment sets XDG_CONFIG_HOME for us in a way that + breaks the test. + + Reported-by: Marc Hörsken + Fixes #6739 + Closes #6777 + +- tftp: remove the 3600 second default timeout + + ... it was never meant to be there. + + Reported-by: Tomas Berger + Fixes #6774 + Closes #6776 + +- docs: make gen.pl support *italic* and **bold** + + Remove some nroffisms from the cmdline doc files to simplify editing, + and instead support this markdown style. + + Closes #6771 + +- ngtcp2: sync with recent API updates + + Closes #6770 + +- RELEASE-NOTES: synced + +- libssh2:ssh_connect: clear session pointer after free + + If libssh2_knownhost_init() returns NULL, like in an OOM situation, the + ssh session was freed but the pointer wasn't cleared which made libcurl + later call libssh2 to cleanup using the stale pointer. + + Fixes #6764 + Closes #6766 + +- [Jacob Hoffman-Andrews brought this change] + + docs: document version of crustls dependency + + This also pins a specific release in the Travis test so future + API-breaking changins in crustls won't break curl builds. + + Add RUSTLS documentation to release tarball. + + Enable running tests for rustls, minus FTP tests (require + connect_blocking, which rustls doesn't implement) and 313 (requires CRL + handling). + + Closes #6763 + +- [Jacob Hoffman-Andrews brought this change] + + rustls: Handle close_notify. + + If we get a close_notify, treat that as EOF. If we get an EOF from the + TCP stream, treat that as an error (because we should have ended the + connection earlier, when we got a close_notify). + + Closes #6763 + +- docs: clarify timeouts for queued transfers in multi API + + Closes #6758 + +- ftpserver: only load the preprocessed test file + + We always preprocess and tests are no longer sensible to load "raw" + + Closes #6738 + +- tests: use %TESTNUMBER instead of fixed number + + This makes the tests easier to copy and relocate to other test numbers + without having to update content. + + Closes #6738 + +- KNOWN_BUGS: CURLOPT_OPENSOCKETPAIRFUNCTION is missing + + Closes #5747 + +- TODO: provide timing info for each redirect + + Closes #6743 + +Jay Satiro (17 Mar 2021) +- docs: Add SSL backend names to CURL_SSL_BACKEND + + - Document the names that can be used with CURL_SSL_BACKEND: + bearssl, gnutls, gskit, mbedtls, mesalink, nss, openssl, rustls, + schannel, secure-transport, wolfssl + + Ref: https://github.com/curl/curl/issues/2209#issuecomment-360623286 + Ref: https://github.com/curl/curl/issues/6717#issuecomment-800745201 + + Closes https://github.com/curl/curl/pull/6755 + +- docs: Explain DOH transfers inherit some SSL settings + + - Document in DOH that some SSL settings are inherited but DOH hostname + and peer verification are not and are controlled separately. + + - Document that CURLOPT_SSL_CTX_FUNCTION is inherited by DOH handles but + we're considering changing behavior to no longer inherit it. Request + feedback. + + Closes https://github.com/curl/curl/pull/6688 + +Daniel Stenberg (17 Mar 2021) +- http: make 416 not fail with resume + CURLOPT_FAILONERRROR + + When asked to resume a download, libcurl will convert that to HTTP logic + and if then the entire file is already transferred it will result in a + 416 response from the HTTP server. With CURLOPT_FAILONERRROR set in that + scenario, it should *not* lead to an error return. + + Updated test 1156, added test 1273 + + Reported-by: Jonathan Watt + Fixes #6740 + Closes #6753 + +- Curl_timeleft: check both timeouts during connect + + The duration of a connect and the total transfer are calculated from two + different time-stamps. It can end up with the total timeout triggering + before the connect timeout expires and we should make sure to + acknowledge whichever timeout that is reached first. + + This is especially notable when a transfer first sits in PENDING, as + that time is counted in the total time but the connect timeout is based + on the time since the handle changed to the CONNECT state. + + The CONNECTTIMEOUT is per connect attempt. The TIMEOUT is for the entire + operation. + + Fixes #6744 + Closes #6745 + Reported-by: Andrei Bica + Assisted-by: Jay Satiro + +- configure: remove use of deprecated macros + + AC_HEADER_TIME, AC_HEADER_STDC and AC_TYPE_SIGNAL + +- configure: make AC_TRY_* into AC_*_IFELSE + + ... as the former versions are deprecated. + +- configure: s/AC_HELP_STRING/AS_HELP_STRING + + AC_HELP_STRING is deprecated in 2.70+ and I believe AS_HELP_STRING works + already since 2.59 so bump the minimum required version to that. + + Reported-by: Emil Engler + Fixes #6647 + Closes #6748 + +- RELEASE-NOTES: synced + +- travis: use ubuntu nghttp2 package instead of build our own + + Closes #6751 + +- travis: bump wolfssl to 4.7.0 + +- travis: only build wolfssl when needed + + Closes #6751 + +- [Jacob Hoffman-Andrews brought this change] + + rustls: allocate a buffer for TLS data. + + Previously, rustls was using an on-stack array for TLS data. However, + crustls has an (unusual) requirement that buffers it deals with are + initialized before writing to them. By using calloc, we can ensure the + buffer is initialized once and then reuse it across calls. + + Closes #6742 + +- travis: add a rustls build + + ... that doesn't run any tests (yet) + + Closes #6750 + +- HTTP2: remove the outdated remark about multiplexing for the tool + +- [Robert Ronto brought this change] + + http2: don't set KEEP_SEND when there's no more data to be sent + + this should fix an issue where curl sometimes doesn't send out a request + with authorization info after a 401 is received over http2 + + Closes #6747 + +Marc Hoersken (15 Mar 2021) +- config: fix building SMB with configure using Win32 Crypto + + Align conditions for NTLM features between CMake and configure + builds by differentiating between USE_NTLM and USE_CURL_NTLM_CORE, + just like curl_setup.h does internally to detect support of: + + - USE_NTLM: required for NTLM crypto authentication feature + - USE_CURL_NTLM_CORE: required for SMB protocol + + Implement USE_WIN32_CRYPTO detection by checking for Crypt functions + in wincrypt.h which are not available in the Windows App environment. + + Link advapi32 and crypt32 for Crypto API and Schannel SSL backend. + Fix condition of Schannel SSL backend in CMake build accordingly. + + Reviewed-by: Marcel Raad + + Closes #6277 + +- config: fix detection of restricted Windows App environment + + Move the detection of the restricted Windows App environment + in curl_setup.h before the definition of USE_WIN32_CRYPTO + via included config-win32.h in case no build system is used. + + Reviewed-by: Marcel Raad + + Part of #6277 + +Daniel Stenberg (15 Mar 2021) +- HISTORY: curl 7.7.2 was the first version used in Mac OS X 10.1 + +- gen.pl: quote "bare" minuses in the nroff curl.1 + + Reported-by: Alejandro Colomar + Fixes #6698 + Closes #6722 + +Daniel Gustafsson (14 Mar 2021) +- hsts: remove unused defines + + MAX_HSTS_SUBLEN and MAX_HSTS_SUBLENSTR were unused from the initial commit, + and mostly likely leftovers from early development. Remove as they're not + used for anything. + + Closes #6741 + Reviewed-by: Daniel Stenberg + +Daniel Stenberg (12 Mar 2021) +- github: add torture-ftp for FTP-only torture testing + + and at 20% to try to keep the run-time reasonable + + Closes #6728 + +- travis: split "torture" into a separate "events" build as well + + Run torture without FTP and reducing coverage to 20% + + For some reason the torture tests now run a lot slower on travis and run + into the 50 minute limit all the time. + + Closes #6728 + +- ftp: fix memory leak in ftp_done + + If after a transfer is complete Curl_GetFTPResponse() returns an error, + curl would not free the ftp->pathalloc block. + + Found by torture-testing test 576 + + Closes #6737 + +- [oxalica brought this change] + + http2: fail if connection terminated without END_STREAM + + Closes #6736 + +- RELEASE-NOTES: synced + +- [Jacob Hoffman-Andrews brought this change] + + rustls: support CURLOPT_SSL_VERIFYPEER + + This requires the latest main branch of crustls, which provides + rustls_client_config_builder_dangerous_set_certificate_verifier and + rustls_client_config_builder_set_enable_sni. + + This refactors the session setup into its own function, and adds a new + function cr_hostname_is_ip. Because crustls doesn't support verification + of IP addresses, special handling is needed: We disable SNI and set a + placeholder hostname (which never actually gets sent on the wire). + + Closes #6719 + +Daniel Gustafsson (12 Mar 2021) +- cookies: Fix potential NULL pointer deref with PSL + + Curl_cookie_init can be called with data being NULL, and this can in turn + be passed to Curl_cookie_add, meaning that both functions must be careful + to only use data where it's checked for being a NULL pointer. The libpsl + support code does however dereference data without checking, so if we are + indeed having an unset data pointer we cannot PSL check the cookiedomain. + + This is currently not a reachable dereference, as the only caller with a + NULL data isn't passing a file to initialize cookies from, but since the + API has this contract let's ensure we hold it. + + Closes #6731 + Reviewed-by: Daniel Stenberg + +Daniel Stenberg (12 Mar 2021) +- [Michael Hordijk brought this change] + + configure: only add OpenSSL paths if they are defined + + Add paths for OpenSSL compiling and linking only if they have been + defined. If they haven't been defined, we'll assume that the paths are + already available to the toolchain. + + Closes #6730 + +Jay Satiro (12 Mar 2021) +- retry.d: Clarify transient 5xx HTTP response codes + + - Clarify the only 5xx response codes that are treated as transient are + 500, 502, 503 and 504. + + Prior to this change it said it treated all 5xx as transient, but the + code says otherwise. + + Ref: https://github.com/curl/curl/blob/curl-7_75_0/src/tool_operate.c#L462-L495 + + Closes https://github.com/curl/curl/pull/6724 + +- retry-all-errors.d: Explain curl errors versus HTTP response errors + + - Add a paragraph explaining that curl does not consider HTTP response + errors as curl errors, and how that behavior can be modified by using + --retry and --fail. + + The --retry-all-errors doc says "Retry on any error" which some users + may find misleading without the added explanation. + + Ref: https://curl.se/docs/faq.html#Why_do_I_get_downloaded_data_eve + Ref: https://curl.se/docs/faq.html#curl_doesn_t_return_error_for_HT + + Reported-by: Lawrence Gripper + + Fixes https://github.com/curl/curl/issues/6712 + Closes https://github.com/curl/curl/pull/6720 + +Daniel Stenberg (11 Mar 2021) +- travis: switch ngtcp2 build over to quictls + + The ngtcp2 project switched over to using the quictls OpenSSL fork + instead of their own patched OpenSSL. We follow suit. + + Closes #6729 + +- test220/314: adjust to run with Hyper + +- c-hyper: support automatic content-encoding + + Closes #6727 + +- http: remove superfluous NULL assign + + Closes #6727 + +- tool_operate: bail if set CURLOPT_HTTP09_ALLOWED returns error + + Closes #6727 + +- setopt: error on CURLOPT_HTTP09_ALLOWED set true with Hyper + + Not supported. + + Closes #6727 + +- test306: make it not run with Hyper + + ... as it tests HTTP/0.9 which Hyper doesn't support. + +- test304: header CRLF cleanup to work with Hyper + +- FTP: allow SIZE to fail when doing (resumed) upload + + Added test 362 to verify. + + Reported-by: Jordan Brown + Regression since 7ea2e1d0c5a7f (7.73.0) + Fixes #6715 + Closes #6725 + +- configure: provide Largefile feature for curl-config + + ... as cmake now does it correctly, and make test1014 check for it + + Closes #6702 + +- config: remove CURL_SIZEOF_CURL_OFF_T use only SIZEOF_CURL_OFF_T + + Make the code consistently use a single name for the size of the + "curl_off_t" type. + + Closes #6702 + +Jay Satiro (10 Mar 2021) +- [Jun-ya Kato brought this change] + + ngtcp2: Fix build error due to change in ngtcp2_addr_init + + ngtcp2/ngtcp2@b8d90a9 changed the function prototype. + + Closes https://github.com/curl/curl/pull/6716 + +Daniel Stenberg (10 Mar 2021) +- [ejanchivdorj brought this change] + + multi: update pending list when removing handle + + when removing a handle, most of the lists are updated but pending list + is not updated. Updating now. + + Closes #6713 + +- [kokke brought this change] + + lib1536: check ptr against NULL before dereferencing it + + Closes #6710 + +- [kokke brought this change] + + lib1537: check ptr against NULL before dereferencing it + + Fixes #6707 + Closes #6708 + +- travis: make torture tests skip TLS-SRP tests + + ... as it seems to often hang. + + Also: skip the "normal" tests as they're already run by many other + builds. + + Closes #6705 + +- openssl: adapt to v3's new const for a few API calls + + Closes #6703 + +- quiche: fix crash when failing to connect + + Reported-by: ウさん + Fixes #6664 + Closes #6701 + +- RELEASE-NOTES: synced + + Fixed the release counter and added a missing contributor + +- RELEASE-NOTES: synced + +- dynbuf: bump the max HTTP request to 1MB + + Raised from 128KB to allow longer request headers. + + Reported-by: Carl Zogheib + Fixes #6681 + Closes #6685 + +Jay Satiro (6 Mar 2021) +- schannel: Evaluate CURLOPT_SSL_OPTIONS via SSL_SET_OPTION macro + + - Change use of those options from CURLOPT_SSL_OPTIONS that are not + already evaluated via SSL_SET_OPTION in schannel and secure transport + to use that instead of data->set.ssl.optname. + + Example: + + Evaluate SSL_SET_OPTION(no_revoke) instead of data->set.ssl.no_revoke. + + This change is because options set via CURLOPT_SSL_OPTIONS + (data->set.ssl.optname) are separate from those set for HTTPS proxy via + CURLOPT_PROXY_SSL_OPTIONS (data->set.proxy_ssl.optname). The + SSL_SET_OPTION macro determines whether the connection is for HTTPS + proxy and based on that which option to evaluate. + + Since neither Schannel nor Secure Transport backends currently support + HTTPS proxy in libcurl, this change is for posterity and has no other + effect. + + Closes https://github.com/curl/curl/pull/6690 + +- [kokke brought this change] + + c-hyper: Remove superfluous pointer check + + `n` pointer is never NULL once set. Found by static analysis. + + Ref: https://github.com/curl/curl/issues/6696 + + Closes https://github.com/curl/curl/pull/6697 + +- version.d: Add missing features to the features list + + - Add missing entries for gsasl, Kerberos, NTLM_WB, TrackMemory, + Unicode and zstd. + + - Remove krb4 since it's no longer a feature. + + Reported-by: Ádler Jonas Gross + + Fixes https://github.com/curl/curl/issues/6677 + Closes https://github.com/curl/curl/pull/6687 + +- [Vladimir Varlamov brought this change] + + docs: add missing Arg tag to --stderr + + Prior to this change the required argument was not shown. + + curl.1 before: --stderr + curl.1 after: --stderr + + curl --help before: + --stderr Where to redirect stderr + + curl --help after: + --stderr Where to redirect stderr + + Closes https://github.com/curl/curl/pull/6692 + +- projects: Update VS projects for OpenSSL 1.1.x + + - Update VS project templates to use the OpenSSL lib names and include + directories for OpenSSL 1.1.x. + + This change means the VS project files will now build only with OpenSSL + 1.1.x when an OpenSSL configuration is chosen. Prior to this change the + project files built only with OpenSSL 1.0.x (end-of-life) when an + OpenSSL configuration was chosen. + + The template changes in this commit were made by script: + + libeay32.lib => libcrypto.lib + ssleay32.lib => libssl.lib + ..\..\..\..\..\openssl\inc32 => ..\..\..\..\..\openssl\include + + And since the output directory now contains the includes it's prepended: + ..\..\..\..\..\openssl\build\Win{32,64}\VC{6..15}\{DLL,LIB} + {Debug,Release}\include + + - Change build-openssl.bat to copy the build's include directory to the + output directory (as seen above). + + Each build has its own opensslconf.h which is different so we can't just + include the source include directory any longer. + + Note the include directory in the output directory is a full copy from + the build so technically we don't need to include the OpenSSL source + include directory in the template. However, I left it last in case the + user made a custom OpenSSL build using the old method which would put + opensslconf in the OpenSSL source include directory. + + - Change build-openssl.bat to use a temporary install directory that is + different from the temporary build directory. + + For OpenSSL 1.1.x the temporary paths must be separate not a descendant + of the other, otherwise pdb files will be lost between builds. + + Ref: https://curl.se/mail/lib-2018-10/0049.html + Ref: https://gist.github.com/jay/125191c35bbeb894444eff827651f755 + Ref; https://github.com/openssl/openssl/issues/10005 + + Fixes https://github.com/curl/curl/issues/984 + Closes https://github.com/curl/curl/pull/6675 + +- doh: Inherit CURLOPT_STDERR from user's easy handle + + Prior to this change if the user set their easy handle's error stream + to something other than stderr it was not inherited by the doh handles, + which meant that they would still write to the default standard error + stream (stderr) for verbose output. + + Bug: https://github.com/curl/curl/issues/6605 + Reported-by: arvids-kokins-bidstack@users.noreply.github.com + + Closes https://github.com/curl/curl/pull/6661 + +Marc Hoersken (1 Mar 2021) +- CI/azure: replace python-impacket with python3-impacket + + As of this month Azure DevOps uses Ubuntu 20.04 LTS which + no longer supports Python 2 and instead ships Python 3. + + Closes #6678 + +- runtests.pl: kill processes locking test log files + + Introduce a new runtests.pl command option: -rm + + For now only required and implemented for Windows. + Ignore stunnel logs due to long running processes. + + Requires Sysinternals handle[64].exe to be on PATH. + + Reviewed-by: Jay Satiro + + Ref: #6058 + Closes #6179 + +- pathhelp.pm: fix use of pwd -L in Msys environment + + While Msys2 has a pwd binary which supports -L, + Msys1 only has a shell built-in with that feature. + + Reviewed-by: Jay Satiro + + Part of #6179 + +Daniel Gustafsson (1 Mar 2021) +- ldap: use correct memory free function + + unescaped is coming from Curl_urldecode and not a unicode conversion + function, so reclaiming its memory should be performed with a normal + call to free rather than curlx_unicodefree. In reality, this is the + same thing as curlx_unicodefree is implemented as a call to free but + that's not guaranteed to always hold. Using the curlx macro present + issues with memory debugging as well. + + Closes #6671 + Reviewed-by: Jay Satiro + Reviewed-by: Daniel Stenberg + +- url: fix typo in comment + + Correct a small typo which snuck in with a304051620. + +Jay Satiro (28 Feb 2021) +- tool_help: Increase space between option and description + + - Increase the minimum number of spaces between the option and the + description from 1 to 2. + + Before: + ~~~ + -u, --user Server user and password + -A, --user-agent Send User-Agent to server + -v, --verbose Make the operation more talkative + -V, --version Show version number and quit + -w, --write-out Use output FORMAT after completion + --xattr Store metadata in extended file attributes + ~~~ + + After: + ~~~ + -u, --user Server user and password + -A, --user-agent Send User-Agent to server + -v, --verbose Make the operation more talkative + -V, --version Show version number and quit + -w, --write-out Use output FORMAT after completion + --xattr Store metadata in extended file attributes + ~~~ + + Closes https://github.com/curl/curl/pull/6674 + +Daniel Stenberg (27 Feb 2021) +- curl: set CURLOPT_NEW_FILE_PERMS if requested + + The --create-file-mode code logic accepted the value but never actually + passed it on to libcurl! + + Follow-up to a7696c73436f (shipped in 7.75.0) + Reported-by: Johannes Lesr + Fixes #6657 + Closes #6666 + +- tool_operate: check argc before accessing argv[1] + + Follow-up to 09363500b + Reported-by: Emil Engler + Reviewed-by: Daniel Gustafsson + Closes #6668 + +Daniel Gustafsson (26 Feb 2021) +- [Jean-Philippe Menil brought this change] + + openssl: remove get_ssl_version_txt in favor of SSL_get_version + + openssl: use SSL_get_version to get connection protocol + + Replace our bespoke get_ssl_version_txt in favor of SSL_get_version. + We can get rid of few lines of code, since SSL_get_version achieve + the exact same thing + + Closes #6665 + Reviewed-by: Daniel Gustafsson + Signed-off-by: Jean-Philippe Menil diff --git a/3rdparty/curl-7.84.0/CMake/CMakeConfigurableFile.in b/3rdparty/curl-7.80.0/CMake/CMakeConfigurableFile.in similarity index 90% rename from 3rdparty/curl-7.84.0/CMake/CMakeConfigurableFile.in rename to 3rdparty/curl-7.80.0/CMake/CMakeConfigurableFile.in index b93e7539..8ccd016a 100644 --- a/3rdparty/curl-7.84.0/CMake/CMakeConfigurableFile.in +++ b/3rdparty/curl-7.80.0/CMake/CMakeConfigurableFile.in @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,7 +18,5 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # -# SPDX-License-Identifier: curl -# ########################################################################### @CMAKE_CONFIGURABLE_FILE_CONTENT@ diff --git a/3rdparty/curl-7.84.0/CMake/CurlSymbolHiding.cmake b/3rdparty/curl-7.80.0/CMake/CurlSymbolHiding.cmake similarity index 97% rename from 3rdparty/curl-7.84.0/CMake/CurlSymbolHiding.cmake rename to 3rdparty/curl-7.80.0/CMake/CurlSymbolHiding.cmake index 75215a12..e99ea6f6 100644 --- a/3rdparty/curl-7.84.0/CMake/CurlSymbolHiding.cmake +++ b/3rdparty/curl-7.80.0/CMake/CurlSymbolHiding.cmake @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,8 +18,6 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # -# SPDX-License-Identifier: curl -# ########################################################################### include(CheckCSourceCompiles) diff --git a/3rdparty/curl-7.84.0/CMake/CurlTests.c b/3rdparty/curl-7.80.0/CMake/CurlTests.c similarity index 98% rename from 3rdparty/curl-7.84.0/CMake/CurlTests.c rename to 3rdparty/curl-7.80.0/CMake/CurlTests.c index cf76fb7d..8666da0d 100644 --- a/3rdparty/curl-7.84.0/CMake/CurlTests.c +++ b/3rdparty/curl-7.80.0/CMake/CurlTests.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2021, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -18,8 +18,6 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * - * SPDX-License-Identifier: curl - * ***************************************************************************/ #ifdef TIME_WITH_SYS_TIME /* Time with sys/time test */ @@ -58,7 +56,7 @@ return 0; # define PLATFORM_AIX_V3 #endif /* */ -#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) +#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || defined(__BEOS__) #error "O_NONBLOCK does not work on this platform" #endif diff --git a/3rdparty/curl-7.84.0/CMake/FindBearSSL.cmake b/3rdparty/curl-7.80.0/CMake/FindBearSSL.cmake similarity index 92% rename from 3rdparty/curl-7.84.0/CMake/FindBearSSL.cmake rename to 3rdparty/curl-7.80.0/CMake/FindBearSSL.cmake index 88d5e87a..9455f4ba 100644 --- a/3rdparty/curl-7.84.0/CMake/FindBearSSL.cmake +++ b/3rdparty/curl-7.80.0/CMake/FindBearSSL.cmake @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,8 +18,6 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # -# SPDX-License-Identifier: curl -# ########################################################################### find_path(BEARSSL_INCLUDE_DIRS bearssl.h) diff --git a/3rdparty/curl-7.84.0/CMake/FindBrotli.cmake b/3rdparty/curl-7.80.0/CMake/FindBrotli.cmake similarity index 93% rename from 3rdparty/curl-7.84.0/CMake/FindBrotli.cmake rename to 3rdparty/curl-7.80.0/CMake/FindBrotli.cmake index 833e1811..0ed08550 100644 --- a/3rdparty/curl-7.84.0/CMake/FindBrotli.cmake +++ b/3rdparty/curl-7.80.0/CMake/FindBrotli.cmake @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,8 +18,6 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # -# SPDX-License-Identifier: curl -# ########################################################################### include(FindPackageHandleStandardArgs) diff --git a/3rdparty/curl-7.84.0/CMake/FindCARES.cmake b/3rdparty/curl-7.80.0/CMake/FindCARES.cmake similarity index 94% rename from 3rdparty/curl-7.84.0/CMake/FindCARES.cmake rename to 3rdparty/curl-7.80.0/CMake/FindCARES.cmake index 99cf31d9..71806823 100644 --- a/3rdparty/curl-7.84.0/CMake/FindCARES.cmake +++ b/3rdparty/curl-7.80.0/CMake/FindCARES.cmake @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,8 +18,6 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # -# SPDX-License-Identifier: curl -# ########################################################################### # - Find c-ares # Find the c-ares includes and library diff --git a/3rdparty/curl-7.84.0/CMake/FindGSS.cmake b/3rdparty/curl-7.80.0/CMake/FindGSS.cmake similarity index 99% rename from 3rdparty/curl-7.84.0/CMake/FindGSS.cmake rename to 3rdparty/curl-7.80.0/CMake/FindGSS.cmake index ec2bd57b..4e4747d6 100644 --- a/3rdparty/curl-7.84.0/CMake/FindGSS.cmake +++ b/3rdparty/curl-7.80.0/CMake/FindGSS.cmake @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,8 +18,6 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # -# SPDX-License-Identifier: curl -# ########################################################################### # - Try to find the GSS Kerberos library # Once done this will define diff --git a/3rdparty/curl-7.84.0/CMake/FindLibSSH2.cmake b/3rdparty/curl-7.80.0/CMake/FindLibSSH2.cmake similarity index 94% rename from 3rdparty/curl-7.84.0/CMake/FindLibSSH2.cmake rename to 3rdparty/curl-7.80.0/CMake/FindLibSSH2.cmake index 0ec7f7e3..ce46a408 100644 --- a/3rdparty/curl-7.84.0/CMake/FindLibSSH2.cmake +++ b/3rdparty/curl-7.80.0/CMake/FindLibSSH2.cmake @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,8 +18,6 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # -# SPDX-License-Identifier: curl -# ########################################################################### # - Try to find the libssh2 library # Once done this will define diff --git a/3rdparty/curl-7.84.0/CMake/FindMbedTLS.cmake b/3rdparty/curl-7.80.0/CMake/FindMbedTLS.cmake similarity index 90% rename from 3rdparty/curl-7.84.0/CMake/FindMbedTLS.cmake rename to 3rdparty/curl-7.80.0/CMake/FindMbedTLS.cmake index fcd6717f..1746093d 100644 --- a/3rdparty/curl-7.84.0/CMake/FindMbedTLS.cmake +++ b/3rdparty/curl-7.80.0/CMake/FindMbedTLS.cmake @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,8 +18,6 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # -# SPDX-License-Identifier: curl -# ########################################################################### find_path(MBEDTLS_INCLUDE_DIRS mbedtls/ssl.h) @@ -30,7 +28,7 @@ find_library(MBEDCRYPTO_LIBRARY mbedcrypto) set(MBEDTLS_LIBRARIES "${MBEDTLS_LIBRARY}" "${MBEDX509_LIBRARY}" "${MBEDCRYPTO_LIBRARY}") include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(MbedTLS DEFAULT_MSG +find_package_handle_standard_args(MBEDTLS DEFAULT_MSG MBEDTLS_INCLUDE_DIRS MBEDTLS_LIBRARY MBEDX509_LIBRARY MBEDCRYPTO_LIBRARY) mark_as_advanced(MBEDTLS_INCLUDE_DIRS MBEDTLS_LIBRARY MBEDX509_LIBRARY MBEDCRYPTO_LIBRARY) diff --git a/3rdparty/curl-7.84.0/CMake/FindNGHTTP2.cmake b/3rdparty/curl-7.80.0/CMake/FindNGHTTP2.cmake similarity index 93% rename from 3rdparty/curl-7.84.0/CMake/FindNGHTTP2.cmake rename to 3rdparty/curl-7.80.0/CMake/FindNGHTTP2.cmake index 6d70c4a0..8614492b 100644 --- a/3rdparty/curl-7.84.0/CMake/FindNGHTTP2.cmake +++ b/3rdparty/curl-7.80.0/CMake/FindNGHTTP2.cmake @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,8 +18,6 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # -# SPDX-License-Identifier: curl -# ########################################################################### include(FindPackageHandleStandardArgs) diff --git a/3rdparty/curl-7.84.0/CMake/FindNGHTTP3.cmake b/3rdparty/curl-7.80.0/CMake/FindNGHTTP3.cmake similarity index 95% rename from 3rdparty/curl-7.84.0/CMake/FindNGHTTP3.cmake rename to 3rdparty/curl-7.80.0/CMake/FindNGHTTP3.cmake index 8d8ebc1b..643b6009 100644 --- a/3rdparty/curl-7.84.0/CMake/FindNGHTTP3.cmake +++ b/3rdparty/curl-7.80.0/CMake/FindNGHTTP3.cmake @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,8 +18,6 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # -# SPDX-License-Identifier: curl -# ########################################################################### #[=======================================================================[.rst: diff --git a/3rdparty/curl-7.84.0/CMake/FindNGTCP2.cmake b/3rdparty/curl-7.80.0/CMake/FindNGTCP2.cmake similarity index 97% rename from 3rdparty/curl-7.84.0/CMake/FindNGTCP2.cmake rename to 3rdparty/curl-7.80.0/CMake/FindNGTCP2.cmake index 37b060ea..5757009a 100644 --- a/3rdparty/curl-7.84.0/CMake/FindNGTCP2.cmake +++ b/3rdparty/curl-7.80.0/CMake/FindNGTCP2.cmake @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,8 +18,6 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # -# SPDX-License-Identifier: curl -# ########################################################################### #[=======================================================================[.rst: diff --git a/3rdparty/curl-7.84.0/CMake/FindNSS.cmake b/3rdparty/curl-7.80.0/CMake/FindNSS.cmake similarity index 93% rename from 3rdparty/curl-7.84.0/CMake/FindNSS.cmake rename to 3rdparty/curl-7.80.0/CMake/FindNSS.cmake index 6742dda8..899c6b07 100644 --- a/3rdparty/curl-7.84.0/CMake/FindNSS.cmake +++ b/3rdparty/curl-7.80.0/CMake/FindNSS.cmake @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,8 +18,6 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # -# SPDX-License-Identifier: curl -# ########################################################################### if(UNIX) find_package(PkgConfig QUIET) diff --git a/3rdparty/curl-7.84.0/CMake/FindQUICHE.cmake b/3rdparty/curl-7.80.0/CMake/FindQUICHE.cmake similarity index 95% rename from 3rdparty/curl-7.84.0/CMake/FindQUICHE.cmake rename to 3rdparty/curl-7.80.0/CMake/FindQUICHE.cmake index fc47027d..0247364d 100644 --- a/3rdparty/curl-7.84.0/CMake/FindQUICHE.cmake +++ b/3rdparty/curl-7.80.0/CMake/FindQUICHE.cmake @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,8 +18,6 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # -# SPDX-License-Identifier: curl -# ########################################################################### #[=======================================================================[.rst: diff --git a/3rdparty/curl-7.84.0/CMake/FindWolfSSL.cmake b/3rdparty/curl-7.80.0/CMake/FindWolfSSL.cmake similarity index 93% rename from 3rdparty/curl-7.84.0/CMake/FindWolfSSL.cmake rename to 3rdparty/curl-7.80.0/CMake/FindWolfSSL.cmake index 986f01e0..42256b3c 100644 --- a/3rdparty/curl-7.84.0/CMake/FindWolfSSL.cmake +++ b/3rdparty/curl-7.80.0/CMake/FindWolfSSL.cmake @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,8 +18,6 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # -# SPDX-License-Identifier: curl -# ########################################################################### find_path(WolfSSL_INCLUDE_DIR NAMES wolfssl/ssl.h) find_library(WolfSSL_LIBRARY NAMES wolfssl) diff --git a/3rdparty/curl-7.84.0/CMake/FindZstd.cmake b/3rdparty/curl-7.80.0/CMake/FindZstd.cmake similarity index 95% rename from 3rdparty/curl-7.84.0/CMake/FindZstd.cmake rename to 3rdparty/curl-7.80.0/CMake/FindZstd.cmake index 2d654044..eaba3974 100644 --- a/3rdparty/curl-7.84.0/CMake/FindZstd.cmake +++ b/3rdparty/curl-7.80.0/CMake/FindZstd.cmake @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,8 +18,6 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # -# SPDX-License-Identifier: curl -# ########################################################################### #[=======================================================================[.rst: diff --git a/3rdparty/curl-7.84.0/CMake/Macros.cmake b/3rdparty/curl-7.80.0/CMake/Macros.cmake similarity index 97% rename from 3rdparty/curl-7.84.0/CMake/Macros.cmake rename to 3rdparty/curl-7.80.0/CMake/Macros.cmake index 4d7380eb..d57dd6ad 100644 --- a/3rdparty/curl-7.84.0/CMake/Macros.cmake +++ b/3rdparty/curl-7.80.0/CMake/Macros.cmake @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,8 +18,6 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # -# SPDX-License-Identifier: curl -# ########################################################################### #File defines convenience macros for available feature testing diff --git a/3rdparty/curl-7.84.0/CMake/OtherTests.cmake b/3rdparty/curl-7.80.0/CMake/OtherTests.cmake similarity index 97% rename from 3rdparty/curl-7.84.0/CMake/OtherTests.cmake rename to 3rdparty/curl-7.80.0/CMake/OtherTests.cmake index 9f62c9de..73c813fe 100644 --- a/3rdparty/curl-7.84.0/CMake/OtherTests.cmake +++ b/3rdparty/curl-7.80.0/CMake/OtherTests.cmake @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2021, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,8 +18,6 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # -# SPDX-License-Identifier: curl -# ########################################################################### include(CheckCSourceCompiles) # The begin of the sources (macros and includes) @@ -238,8 +236,8 @@ endif() unset(CMAKE_TRY_COMPILE_TARGET_TYPE) if(NOT DEFINED CMAKE_TOOLCHAIN_FILE) - if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "iOS") - # only try this on non-apple platforms + if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + # only try this on non-macOS # if not cross-compilation... include(CheckCSourceRuns) diff --git a/3rdparty/curl-7.84.0/CMake/Platforms/WindowsCache.cmake b/3rdparty/curl-7.80.0/CMake/Platforms/WindowsCache.cmake similarity index 97% rename from 3rdparty/curl-7.84.0/CMake/Platforms/WindowsCache.cmake rename to 3rdparty/curl-7.80.0/CMake/Platforms/WindowsCache.cmake index 6043e72a..fb803f8a 100644 --- a/3rdparty/curl-7.84.0/CMake/Platforms/WindowsCache.cmake +++ b/3rdparty/curl-7.80.0/CMake/Platforms/WindowsCache.cmake @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2021, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,8 +18,6 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # -# SPDX-License-Identifier: curl -# ########################################################################### if(NOT UNIX) if(WIN32) diff --git a/3rdparty/curl-7.84.0/CMake/Utilities.cmake b/3rdparty/curl-7.80.0/CMake/Utilities.cmake similarity index 92% rename from 3rdparty/curl-7.84.0/CMake/Utilities.cmake rename to 3rdparty/curl-7.80.0/CMake/Utilities.cmake index 78bfd6ff..8f9b861b 100644 --- a/3rdparty/curl-7.84.0/CMake/Utilities.cmake +++ b/3rdparty/curl-7.80.0/CMake/Utilities.cmake @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,8 +18,6 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # -# SPDX-License-Identifier: curl -# ########################################################################### # File containing various utilities diff --git a/3rdparty/curl-7.84.0/CMake/cmake_uninstall.cmake.in b/3rdparty/curl-7.80.0/CMake/cmake_uninstall.cmake.in similarity index 95% rename from 3rdparty/curl-7.84.0/CMake/cmake_uninstall.cmake.in rename to 3rdparty/curl-7.80.0/CMake/cmake_uninstall.cmake.in index 55801f50..e96c1432 100644 --- a/3rdparty/curl-7.84.0/CMake/cmake_uninstall.cmake.in +++ b/3rdparty/curl-7.80.0/CMake/cmake_uninstall.cmake.in @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,8 +18,6 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # -# SPDX-License-Identifier: curl -# ########################################################################### if(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt") message(FATAL_ERROR "Cannot find install manifest: @CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt") diff --git a/3rdparty/curl-7.84.0/CMake/curl-config.cmake.in b/3rdparty/curl-7.80.0/CMake/curl-config.cmake.in similarity index 92% rename from 3rdparty/curl-7.84.0/CMake/curl-config.cmake.in rename to 3rdparty/curl-7.80.0/CMake/curl-config.cmake.in index 496a92d0..957148ec 100644 --- a/3rdparty/curl-7.84.0/CMake/curl-config.cmake.in +++ b/3rdparty/curl-7.80.0/CMake/curl-config.cmake.in @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,8 +18,6 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # -# SPDX-License-Identifier: curl -# ########################################################################### @PACKAGE_INIT@ diff --git a/3rdparty/curl-7.84.0/CMakeLists.txt b/3rdparty/curl-7.80.0/CMakeLists.txt similarity index 93% rename from 3rdparty/curl-7.84.0/CMakeLists.txt rename to 3rdparty/curl-7.80.0/CMakeLists.txt index ad20777f..a88f49b3 100644 --- a/3rdparty/curl-7.84.0/CMakeLists.txt +++ b/3rdparty/curl-7.80.0/CMakeLists.txt @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2021, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,8 +18,6 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # -# SPDX-License-Identifier: curl -# ########################################################################### # curl/libcurl CMake script # by Tetetest and Sukender (Benoit Neil) @@ -67,7 +65,7 @@ message(STATUS "curl version=[${CURL_VERSION}]") # SET(PACKAGE_STRING "curl-") # SET(PACKAGE_BUGREPORT "a suitable curl mailing list => https://curl.se/mail/") set(OPERATING_SYSTEM "${CMAKE_SYSTEM_NAME}") -set(OS "\"${CMAKE_SYSTEM_NAME}${CURL_OS_SUFFIX}\"") +set(OS "\"${CMAKE_SYSTEM_NAME}\"") include_directories(${CURL_SOURCE_DIR}/include) @@ -111,7 +109,7 @@ option(ENABLE_CURLDEBUG "Set to ON to build with TrackMemory feature enabled" OF if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANG) if(PICKY_COMPILER) - foreach(_CCOPT -pedantic -Wall -W -Wpointer-arith -Wwrite-strings -Wunused -Wshadow -Winline -Wnested-externs -Wmissing-declarations -Wmissing-prototypes -Wfloat-equal -Wsign-compare -Wundef -Wendif-labels -Wstrict-prototypes -Wdeclaration-after-statement -Wstrict-aliasing=3 -Wcast-align -Wtype-limits -Wold-style-declaration -Wmissing-parameter-type -Wempty-body -Wclobbered -Wignored-qualifiers -Wconversion -Wvla -Wdouble-promotion -Wenum-conversion -Warith-conversion) + foreach(_CCOPT -pedantic -Wall -W -Wpointer-arith -Wwrite-strings -Wunused -Wshadow -Winline -Wnested-externs -Wmissing-declarations -Wmissing-prototypes -Wfloat-equal -Wsign-compare -Wundef -Wendif-labels -Wstrict-prototypes -Wdeclaration-after-statement -Wstrict-aliasing=3 -Wcast-align -Wtype-limits -Wold-style-declaration -Wmissing-parameter-type -Wempty-body -Wclobbered -Wignored-qualifiers -Wconversion -Wvla -Wdouble-promotion) # surprisingly, CHECK_C_COMPILER_FLAG needs a new variable to store each new # test result in. string(MAKE_C_IDENTIFIER "OPT${_CCOPT}" _optvarname) @@ -336,6 +334,13 @@ check_library_exists_concat("${CMAKE_DL_LIBS}" dlopen HAVE_LIBDL) check_library_exists_concat("socket" connect HAVE_LIBSOCKET) check_library_exists("c" gethostbyname "" NOT_NEED_LIBNSL) +# Yellowtab Zeta needs different libraries than BeOS 5. +if(BEOS) + set(NOT_NEED_LIBNSL 1) + check_library_exists_concat("bind" gethostbyname HAVE_LIBBIND) + check_library_exists_concat("bnetapi" closesocket HAVE_LIBBNETAPI) +endif() + if(NOT NOT_NEED_LIBNSL) check_library_exists_concat("nsl" gethostbyname HAVE_LIBNSL) endif() @@ -347,72 +352,61 @@ if(WIN32) check_library_exists_concat("winmm" getch HAVE_LIBWINMM) endif() -# This check below for use of deprecated symbols is only temporary and is to -# be removed again after a year's service. Remove after November 25, 2022. -set(CURL_RECONFIG_REQUIRED 0) -foreach(_LIB GSSAPI OPENLDAP LIBSSH LIBSSH2 BEARSSL MBEDTLS NSS OPENSSL - SCHANNEL SECTRANSP WOLFSSL) - if(CMAKE_USE_${_LIB}) - set(CURL_RECONFIG_REQUIRED 1) - message(SEND_ERROR "The option CMAKE_USE_${_LIB} was renamed to CURL_USE_${_LIB}.") - endif() -endforeach() -if(CMAKE_USE_WINSSL) - set(CURL_RECONFIG_REQUIRED 1) - message(SEND_ERROR "The option CMAKE_USE_WINSSL was renamed to CURL_USE_SCHANNEL.") -endif() -if(CURL_RECONFIG_REQUIRED) - message(FATAL_ERROR "Reconfig required") -endif() - # check SSL libraries # TODO support GnuTLS option(CURL_ENABLE_SSL "Enable SSL support" ON) +if(CMAKE_USE_WINSSL) + message(FATAL_ERROR "The cmake option CMAKE_USE_WINSSL was renamed to CMAKE_USE_SCHANNEL.") +endif() if(APPLE) - cmake_dependent_option(CURL_USE_SECTRANSP "enable Apple OS native SSL/TLS" OFF CURL_ENABLE_SSL OFF) + cmake_dependent_option(CMAKE_USE_SECTRANSP "enable Apple OS native SSL/TLS" OFF CURL_ENABLE_SSL OFF) endif() if(WIN32) - cmake_dependent_option(CURL_USE_SCHANNEL "enable Windows native SSL/TLS" OFF CURL_ENABLE_SSL OFF) + cmake_dependent_option(CMAKE_USE_SCHANNEL "enable Windows native SSL/TLS" OFF CURL_ENABLE_SSL OFF) cmake_dependent_option(CURL_WINDOWS_SSPI "Use windows libraries to allow NTLM authentication without openssl" ON - CURL_USE_SCHANNEL OFF) + CMAKE_USE_SCHANNEL OFF) endif() -cmake_dependent_option(CURL_USE_MBEDTLS "Enable mbedTLS for SSL/TLS" OFF CURL_ENABLE_SSL OFF) -cmake_dependent_option(CURL_USE_BEARSSL "Enable BearSSL for SSL/TLS" OFF CURL_ENABLE_SSL OFF) -cmake_dependent_option(CURL_USE_NSS "Enable NSS for SSL/TLS" OFF CURL_ENABLE_SSL OFF) -cmake_dependent_option(CURL_USE_WOLFSSL "enable wolfSSL for SSL/TLS" OFF CURL_ENABLE_SSL OFF) +cmake_dependent_option(CMAKE_USE_MBEDTLS "Enable mbedTLS for SSL/TLS" OFF CURL_ENABLE_SSL OFF) +cmake_dependent_option(CMAKE_USE_BEARSSL "Enable BearSSL for SSL/TLS" OFF CURL_ENABLE_SSL OFF) +cmake_dependent_option(CMAKE_USE_NSS "Enable NSS for SSL/TLS" OFF CURL_ENABLE_SSL OFF) +cmake_dependent_option(CMAKE_USE_WOLFSSL "enable wolfSSL for SSL/TLS" OFF CURL_ENABLE_SSL OFF) set(openssl_default ON) -if(WIN32 OR CURL_USE_SECTRANSP OR CURL_USE_SCHANNEL OR CURL_USE_MBEDTLS OR CURL_USE_NSS OR CURL_USE_WOLFSSL) +if(WIN32 OR CMAKE_USE_SECTRANSP OR CMAKE_USE_SCHANNEL OR CMAKE_USE_MBEDTLS OR CMAKE_USE_NSS OR CMAKE_USE_WOLFSSL) set(openssl_default OFF) endif() -cmake_dependent_option(CURL_USE_OPENSSL "Use OpenSSL code. Experimental" ${openssl_default} CURL_ENABLE_SSL OFF) +cmake_dependent_option(CMAKE_USE_OPENSSL "Use OpenSSL code. Experimental" ${openssl_default} CURL_ENABLE_SSL OFF) option(CURL_DISABLE_OPENSSL_AUTO_LOAD_CONFIG "Disable automatic loading of OpenSSL configuration" OFF) count_true(enabled_ssl_options_count - CURL_USE_SCHANNEL - CURL_USE_SECTRANSP - CURL_USE_OPENSSL - CURL_USE_MBEDTLS - CURL_USE_BEARSSL - CURL_USE_NSS - CURL_USE_WOLFSSL + CMAKE_USE_SCHANNEL + CMAKE_USE_SECTRANSP + CMAKE_USE_OPENSSL + CMAKE_USE_MBEDTLS + CMAKE_USE_BEARSSL + CMAKE_USE_NSS + CMAKE_USE_WOLFSSL ) if(enabled_ssl_options_count GREATER "1") set(CURL_WITH_MULTI_SSL ON) endif() -if(CURL_USE_SCHANNEL) +if(CMAKE_USE_SCHANNEL) set(SSL_ENABLED ON) set(USE_SCHANNEL ON) # Windows native SSL/TLS support - set(USE_WINDOWS_SSPI ON) # CURL_USE_SCHANNEL implies CURL_WINDOWS_SSPI + set(USE_WINDOWS_SSPI ON) # CMAKE_USE_SCHANNEL implies CURL_WINDOWS_SSPI endif() if(CURL_WINDOWS_SSPI) set(USE_WINDOWS_SSPI ON) set(CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS} -DSECURITY_WIN32") endif() -if(CURL_USE_SECTRANSP) +if(CMAKE_USE_DARWINSSL) + message(FATAL_ERROR "The cmake option CMAKE_USE_DARWINSSL was renamed to CMAKE_USE_SECTRANSP.") +endif() + +if(CMAKE_USE_SECTRANSP) set(use_core_foundation ON) find_library(SECURITY_FRAMEWORK "Security") @@ -434,7 +428,7 @@ if(use_core_foundation) list(APPEND CURL_LIBS "-framework CoreFoundation") endif() -if(CURL_USE_OPENSSL) +if(CMAKE_USE_OPENSSL) find_package(OpenSSL REQUIRED) set(SSL_ENABLED ON) set(USE_OPENSSL ON) @@ -464,7 +458,7 @@ if(CURL_USE_OPENSSL) add_definitions(-DOPENSSL_SUPPRESS_DEPRECATED) endif() -if(CURL_USE_MBEDTLS) +if(CMAKE_USE_MBEDTLS) find_package(MbedTLS REQUIRED) set(SSL_ENABLED ON) set(USE_MBEDTLS ON) @@ -472,7 +466,7 @@ if(CURL_USE_MBEDTLS) include_directories(${MBEDTLS_INCLUDE_DIRS}) endif() -if(CURL_USE_BEARSSL) +if(CMAKE_USE_BEARSSL) find_package(BearSSL REQUIRED) set(SSL_ENABLED ON) set(USE_BEARSSL ON) @@ -480,7 +474,7 @@ if(CURL_USE_BEARSSL) include_directories(${BEARSSL_INCLUDE_DIRS}) endif() -if(CURL_USE_WOLFSSL) +if(CMAKE_USE_WOLFSSL) find_package(WolfSSL REQUIRED) set(SSL_ENABLED ON) set(USE_WOLFSSL ON) @@ -488,7 +482,7 @@ if(CURL_USE_WOLFSSL) include_directories(${WolfSSL_INCLUDE_DIRS}) endif() -if(CURL_USE_NSS) +if(CMAKE_USE_NSS) find_package(NSS REQUIRED) include_directories(${NSS_INCLUDE_DIRS}) list(APPEND CURL_LIBS ${NSS_LIBRARIES}) @@ -558,16 +552,6 @@ if(USE_QUICHE) cmake_pop_check_state() endif() -option(USE_MSH3 "Use msquic library for HTTP/3 support" OFF) -if(USE_MSH3) - if(USE_NGTCP2 OR USE_QUICHE) - message(FATAL_ERROR "Only one HTTP/3 backend can be selected!") - endif() - set(USE_MSH3 ON) - include_directories(${MSH3_INCLUDE_DIRS}) - list(APPEND CURL_LIBS ${MSH3_LIBRARIES}) -endif() - if(NOT CURL_DISABLE_LDAP) if(WIN32) option(USE_WIN32_LDAP "Use Windows LDAP implementation" ON) @@ -579,13 +563,13 @@ if(NOT CURL_DISABLE_LDAP) endif() endif() - option(CURL_USE_OPENLDAP "Use OpenLDAP code." OFF) - mark_as_advanced(CURL_USE_OPENLDAP) + option(CMAKE_USE_OPENLDAP "Use OpenLDAP code." OFF) + mark_as_advanced(CMAKE_USE_OPENLDAP) set(CMAKE_LDAP_LIB "ldap" CACHE STRING "Name or full path to ldap library") set(CMAKE_LBER_LIB "lber" CACHE STRING "Name or full path to lber library") - if(CURL_USE_OPENLDAP AND USE_WIN32_LDAP) - message(FATAL_ERROR "Cannot use USE_WIN32_LDAP and CURL_USE_OPENLDAP at the same time") + if(CMAKE_USE_OPENLDAP AND USE_WIN32_LDAP) + message(FATAL_ERROR "Cannot use USE_WIN32_LDAP and CMAKE_USE_OPENLDAP at the same time") endif() # Now that we know, we're not using windows LDAP... @@ -615,7 +599,7 @@ if(NOT CURL_DISABLE_LDAP) set(CURL_DISABLE_LDAP ON CACHE BOOL "" FORCE) set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES_BAK}) #LDAP includes won't be used else() - if(CURL_USE_OPENLDAP) + if(CMAKE_USE_OPENLDAP) set(USE_OPENLDAP ON) endif() if(CMAKE_LDAP_INCLUDE_DIR) @@ -677,12 +661,11 @@ if(NOT CURL_DISABLE_LDAPS) check_include_file_concat("ldapssl.h" HAVE_LDAPSSL_H) endif() -# Check for idn2 +# Check for idn option(USE_LIBIDN2 "Use libidn2 for IDN support" ON) +set(HAVE_LIBIDN2 OFF) if(USE_LIBIDN2) check_library_exists_concat("idn2" idn2_lookup_ul HAVE_LIBIDN2) -else() - set(HAVE_LIBIDN2 OFF) endif() if(WIN32) @@ -745,39 +728,14 @@ if(CURL_ZSTD) endif() endif() -#libpsl -option(CURL_USE_LIBPSL "Use libPSL" ON) -mark_as_advanced(CURL_USE_LIBPSL) -set(USE_LIBPSL OFF) -set(HAVE_LIBPSL OFF) -set(HAVE_LIBSPSL_H OFF) - -if(CURL_USE_LIBPSL) - find_package(LibPSL) - if(LIBPSL_FOUND) - list(APPEND CURL_LIBS ${LIBPSL_LIBRARY}) - set(CMAKE_REQUIRED_LIBRARIES ${LIBPSL_LIBRARY}) - list(APPEND CMAKE_REQUIRED_INCLUDES "${LIBPSL_INCLUDE_DIR}") - include_directories("${LIBPSL_INCLUDE_DIR}") - set(HAVE_LIBPSL ON) - set(USE_LIBPSL ON) - - # find_package has already found the headers - set(HAVE_LIBPSL_H ON) - set(CURL_INCLUDES ${CURL_INCLUDES} "${LIBPSL_INCLUDE_DIR}/libpsl.h") - set(CURL_TEST_DEFINES "${CURL_TEST_DEFINES} -DHAVE_LIBPSL_H") - unset(CMAKE_REQUIRED_LIBRARIES) - endif() -endif() - #libSSH2 -option(CURL_USE_LIBSSH2 "Use libSSH2" ON) -mark_as_advanced(CURL_USE_LIBSSH2) +option(CMAKE_USE_LIBSSH2 "Use libSSH2" ON) +mark_as_advanced(CMAKE_USE_LIBSSH2) set(USE_LIBSSH2 OFF) set(HAVE_LIBSSH2 OFF) set(HAVE_LIBSSH2_H OFF) -if(CURL_USE_LIBSSH2) +if(CMAKE_USE_LIBSSH2) find_package(LibSSH2) if(LIBSSH2_FOUND) list(APPEND CURL_LIBS ${LIBSSH2_LIBRARY}) @@ -796,9 +754,9 @@ if(CURL_USE_LIBSSH2) endif() # libssh -option(CURL_USE_LIBSSH "Use libSSH" OFF) -mark_as_advanced(CURL_USE_LIBSSH) -if(NOT HAVE_LIBSSH2 AND CURL_USE_LIBSSH) +option(CMAKE_USE_LIBSSH "Use libSSH" OFF) +mark_as_advanced(CMAKE_USE_LIBSSH) +if(NOT HAVE_LIBSSH2 AND CMAKE_USE_LIBSSH) find_package(libssh CONFIG) if(libssh_FOUND) message(STATUS "Found libssh ${libssh_VERSION}") @@ -809,10 +767,10 @@ if(NOT HAVE_LIBSSH2 AND CURL_USE_LIBSSH) endif() endif() -option(CURL_USE_GSSAPI "Use GSSAPI implementation (right now only Heimdal is supported with CMake build)" OFF) -mark_as_advanced(CURL_USE_GSSAPI) +option(CMAKE_USE_GSSAPI "Use GSSAPI implementation (right now only Heimdal is supported with CMake build)" OFF) +mark_as_advanced(CMAKE_USE_GSSAPI) -if(CURL_USE_GSSAPI) +if(CMAKE_USE_GSSAPI) find_package(GSS) set(HAVE_GSSAPI ${GSS_FOUND}) @@ -1055,10 +1013,8 @@ if(HAVE_SIZEOF_LONG_LONG) set(HAVE_LL 1) endif() -if(NOT CMAKE_CROSSCOMPILING) - find_file(RANDOM_FILE urandom /dev) - mark_as_advanced(RANDOM_FILE) -endif() +find_file(RANDOM_FILE urandom /dev) +mark_as_advanced(RANDOM_FILE) # Check for some functions that are used if(HAVE_LIBWS2_32) @@ -1067,7 +1023,6 @@ elseif(HAVE_LIBSOCKET) set(CMAKE_REQUIRED_LIBRARIES socket) endif() -check_symbol_exists(fchmod "${CURL_INCLUDES}" HAVE_FCHMOD) check_symbol_exists(basename "${CURL_INCLUDES}" HAVE_BASENAME) check_symbol_exists(socket "${CURL_INCLUDES}" HAVE_SOCKET) check_symbol_exists(select "${CURL_INCLUDES}" HAVE_SELECT) diff --git a/3rdparty/curl-7.84.0/COPYING b/3rdparty/curl-7.80.0/COPYING similarity index 94% rename from 3rdparty/curl-7.84.0/COPYING rename to 3rdparty/curl-7.80.0/COPYING index 90f05adf..48f14475 100644 --- a/3rdparty/curl-7.84.0/COPYING +++ b/3rdparty/curl-7.80.0/COPYING @@ -1,6 +1,6 @@ COPYRIGHT AND PERMISSION NOTICE -Copyright (c) 1996 - 2022, Daniel Stenberg, , and many +Copyright (c) 1996 - 2021, Daniel Stenberg, , and many contributors, see the THANKS file. All rights reserved. diff --git a/3rdparty/curl-7.84.0/MacOSX-Framework b/3rdparty/curl-7.80.0/MacOSX-Framework similarity index 97% rename from 3rdparty/curl-7.84.0/MacOSX-Framework rename to 3rdparty/curl-7.80.0/MacOSX-Framework index 97cd00b9..3c845277 100644 --- a/3rdparty/curl-7.84.0/MacOSX-Framework +++ b/3rdparty/curl-7.80.0/MacOSX-Framework @@ -6,7 +6,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2021, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -19,8 +19,6 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # -# SPDX-License-Identifier: curl -# ########################################################################### # This script performs all of the steps needed to build a # universal binary libcurl.framework for Mac OS X 10.4 or greater. @@ -118,7 +116,7 @@ if test ! -z $SDK32; then mkdir -p libcurl.framework/${FRAMEWORK_VERSION}/Resources cp lib/.libs/libcurl.dylib libcurl.framework/${FRAMEWORK_VERSION}/libcurl install_name_tool -id @rpath/libcurl.framework/${FRAMEWORK_VERSION}/libcurl libcurl.framework/${FRAMEWORK_VERSION}/libcurl - cp lib/libcurl.plist libcurl.framework/${FRAMEWORK_VERSION}/Resources/Info.plist + /usr/bin/sed -e "s/7\.12\.3/$VERSION/" lib/libcurl.plist >libcurl.framework/${FRAMEWORK_VERSION}/Resources/Info.plist mkdir -p libcurl.framework/${FRAMEWORK_VERSION}/Headers/curl cp include/curl/*.h libcurl.framework/${FRAMEWORK_VERSION}/Headers/curl pushd libcurl.framework diff --git a/3rdparty/curl-7.84.0/Makefile b/3rdparty/curl-7.80.0/Makefile similarity index 73% rename from 3rdparty/curl-7.84.0/Makefile rename to 3rdparty/curl-7.80.0/Makefile index ab5a9b5f..1a531c15 100644 --- a/3rdparty/curl-7.84.0/Makefile +++ b/3rdparty/curl-7.80.0/Makefile @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2021, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,8 +18,6 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # -# SPDX-License-Identifier: curl -# ########################################################################### all: @@ -75,6 +73,31 @@ amiga: cd ./lib && make -f makefile.amiga cd ./src && make -f makefile.amiga +netware: + $(MAKE) -C lib -f Makefile.netware + $(MAKE) -C src -f Makefile.netware + +netware-clean: + $(MAKE) -C lib -f Makefile.netware clean + $(MAKE) -C src -f Makefile.netware clean + $(MAKE) -C docs/examples -f Makefile.netware clean + +netware-vclean netware-distclean: + $(MAKE) -C lib -f Makefile.netware vclean + $(MAKE) -C src -f Makefile.netware vclean + $(MAKE) -C docs/examples -f Makefile.netware vclean + +netware-install: + $(MAKE) -C lib -f Makefile.netware install + $(MAKE) -C src -f Makefile.netware install + +netware-examples-%: + $(MAKE) -C docs/examples -f Makefile.netware CFG=$@ + +netware-%: + $(MAKE) -C lib -f Makefile.netware CFG=$@ + $(MAKE) -C src -f Makefile.netware CFG=$@ + unix: all unix-ssl: ssl @@ -83,7 +106,7 @@ linux: all linux-ssl: ssl -ca-bundle: scripts/mk-ca-bundle.pl +ca-bundle: lib/mk-ca-bundle.pl @echo "generate a fresh ca-bundle.crt" @perl $< -b -l -u lib/ca-bundle.crt diff --git a/3rdparty/curl-7.84.0/Makefile.am b/3rdparty/curl-7.80.0/Makefile.am similarity index 65% rename from 3rdparty/curl-7.84.0/Makefile.am rename to 3rdparty/curl-7.80.0/Makefile.am index 40771ed3..3e55230e 100644 --- a/3rdparty/curl-7.84.0/Makefile.am +++ b/3rdparty/curl-7.80.0/Makefile.am @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2021, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,8 +18,6 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # -# SPDX-License-Identifier: curl -# ########################################################################### AUTOMAKE_OPTIONS = foreign @@ -36,10 +34,8 @@ CMAKE_DIST = \ CMake/FindBrotli.cmake \ CMake/FindCARES.cmake \ CMake/FindGSS.cmake \ - CMake/FindLibPSL.cmake \ CMake/FindLibSSH2.cmake \ CMake/FindMbedTLS.cmake \ - CMake/FindMSH3.cmake \ CMake/FindNGHTTP2.cmake \ CMake/FindNGHTTP3.cmake \ CMake/FindNGTCP2.cmake \ @@ -53,6 +49,41 @@ CMAKE_DIST = \ CMake/Utilities.cmake \ CMakeLists.txt +VC6_LIBTMPL = projects/Windows/VC6/lib/libcurl.tmpl +VC6_LIBDSP = projects/Windows/VC6/lib/libcurl.dsp.dist +VC6_LIBDSP_DEPS = $(VC6_LIBTMPL) Makefile.am lib/Makefile.inc +VC6_SRCTMPL = projects/Windows/VC6/src/curl.tmpl +VC6_SRCDSP = projects/Windows/VC6/src/curl.dsp.dist +VC6_SRCDSP_DEPS = $(VC6_SRCTMPL) Makefile.am src/Makefile.inc + +VC7_LIBTMPL = projects/Windows/VC7/lib/libcurl.tmpl +VC7_LIBVCPROJ = projects/Windows/VC7/lib/libcurl.vcproj.dist +VC7_LIBVCPROJ_DEPS = $(VC7_LIBTMPL) Makefile.am lib/Makefile.inc +VC7_SRCTMPL = projects/Windows/VC7/src/curl.tmpl +VC7_SRCVCPROJ = projects/Windows/VC7/src/curl.vcproj.dist +VC7_SRCVCPROJ_DEPS = $(VC7_SRCTMPL) Makefile.am src/Makefile.inc + +VC71_LIBTMPL = projects/Windows/VC7.1/lib/libcurl.tmpl +VC71_LIBVCPROJ = projects/Windows/VC7.1/lib/libcurl.vcproj.dist +VC71_LIBVCPROJ_DEPS = $(VC71_LIBTMPL) Makefile.am lib/Makefile.inc +VC71_SRCTMPL = projects/Windows/VC7.1/src/curl.tmpl +VC71_SRCVCPROJ = projects/Windows/VC7.1/src/curl.vcproj.dist +VC71_SRCVCPROJ_DEPS = $(VC71_SRCTMPL) Makefile.am src/Makefile.inc + +VC8_LIBTMPL = projects/Windows/VC8/lib/libcurl.tmpl +VC8_LIBVCPROJ = projects/Windows/VC8/lib/libcurl.vcproj.dist +VC8_LIBVCPROJ_DEPS = $(VC8_LIBTMPL) Makefile.am lib/Makefile.inc +VC8_SRCTMPL = projects/Windows/VC8/src/curl.tmpl +VC8_SRCVCPROJ = projects/Windows/VC8/src/curl.vcproj.dist +VC8_SRCVCPROJ_DEPS = $(VC8_SRCTMPL) Makefile.am src/Makefile.inc + +VC9_LIBTMPL = projects/Windows/VC9/lib/libcurl.tmpl +VC9_LIBVCPROJ = projects/Windows/VC9/lib/libcurl.vcproj.dist +VC9_LIBVCPROJ_DEPS = $(VC9_LIBTMPL) Makefile.am lib/Makefile.inc +VC9_SRCTMPL = projects/Windows/VC9/src/curl.tmpl +VC9_SRCVCPROJ = projects/Windows/VC9/src/curl.vcproj.dist +VC9_SRCVCPROJ_DEPS = $(VC9_SRCTMPL) Makefile.am src/Makefile.inc + VC10_LIBTMPL = projects/Windows/VC10/lib/libcurl.tmpl VC10_LIBVCXPROJ = projects/Windows/VC10/lib/libcurl.vcxproj.dist VC10_LIBVCXPROJ_DEPS = $(VC10_LIBTMPL) Makefile.am lib/Makefile.inc @@ -81,56 +112,59 @@ VC14_SRCTMPL = projects/Windows/VC14/src/curl.tmpl VC14_SRCVCXPROJ = projects/Windows/VC14/src/curl.vcxproj.dist VC14_SRCVCXPROJ_DEPS = $(VC14_SRCTMPL) Makefile.am src/Makefile.inc -VC14_10_LIBTMPL = projects/Windows/VC14.10/lib/libcurl.tmpl -VC14_10_LIBVCXPROJ = projects/Windows/VC14.10/lib/libcurl.vcxproj.dist -VC14_10_LIBVCXPROJ_DEPS = $(VC14_10_LIBTMPL) Makefile.am lib/Makefile.inc -VC14_10_SRCTMPL = projects/Windows/VC14.10/src/curl.tmpl -VC14_10_SRCVCXPROJ = projects/Windows/VC14.10/src/curl.vcxproj.dist -VC14_10_SRCVCXPROJ_DEPS = $(VC14_10_SRCTMPL) Makefile.am src/Makefile.inc - -VC14_30_LIBTMPL = projects/Windows/VC14.30/lib/libcurl.tmpl -VC14_30_LIBVCXPROJ = projects/Windows/VC14.30/lib/libcurl.vcxproj.dist -VC14_30_LIBVCXPROJ_DEPS = $(VC14_30_LIBTMPL) Makefile.am lib/Makefile.inc -VC14_30_SRCTMPL = projects/Windows/VC14.30/src/curl.tmpl -VC14_30_SRCVCXPROJ = projects/Windows/VC14.30/src/curl.vcxproj.dist -VC14_30_SRCVCXPROJ_DEPS = $(VC14_30_SRCTMPL) Makefile.am src/Makefile.inc - -VC_DIST = projects/README.md \ - projects/build-openssl.bat \ - projects/build-wolfssl.bat \ - projects/checksrc.bat \ - projects/Windows/VC10/curl-all.sln \ - projects/Windows/VC10/lib/libcurl.sln \ - projects/Windows/VC10/lib/libcurl.vcxproj.filters \ - projects/Windows/VC10/src/curl.sln \ - projects/Windows/VC10/src/curl.vcxproj.filters \ - projects/Windows/VC11/curl-all.sln \ - projects/Windows/VC11/lib/libcurl.sln \ - projects/Windows/VC11/lib/libcurl.vcxproj.filters \ - projects/Windows/VC11/src/curl.sln \ - projects/Windows/VC11/src/curl.vcxproj.filters \ - projects/Windows/VC12/curl-all.sln \ - projects/Windows/VC12/lib/libcurl.sln \ - projects/Windows/VC12/lib/libcurl.vcxproj.filters \ - projects/Windows/VC12/src/curl.sln \ - projects/Windows/VC12/src/curl.vcxproj.filters \ - projects/Windows/VC14/curl-all.sln \ - projects/Windows/VC14/lib/libcurl.sln \ - projects/Windows/VC14/lib/libcurl.vcxproj.filters \ - projects/Windows/VC14/src/curl.sln \ - projects/Windows/VC14/src/curl.vcxproj.filters \ - projects/Windows/VC14.10/curl-all.sln \ - projects/Windows/VC14.10/lib/libcurl.sln \ - projects/Windows/VC14.10/lib/libcurl.vcxproj.filters \ - projects/Windows/VC14.10/src/curl.sln \ - projects/Windows/VC14.10/src/curl.vcxproj.filters \ - projects/Windows/VC14.30/curl-all.sln \ - projects/Windows/VC14.30/lib/libcurl.sln \ - projects/Windows/VC14.30/lib/libcurl.vcxproj.filters \ - projects/Windows/VC14.30/src/curl.sln \ - projects/Windows/VC14.30/src/curl.vcxproj.filters \ - projects/generate.bat \ - projects/wolfssl_options.h \ +VC15_LIBTMPL = projects/Windows/VC15/lib/libcurl.tmpl +VC15_LIBVCXPROJ = projects/Windows/VC15/lib/libcurl.vcxproj.dist +VC15_LIBVCXPROJ_DEPS = $(VC15_LIBTMPL) Makefile.am lib/Makefile.inc +VC15_SRCTMPL = projects/Windows/VC15/src/curl.tmpl +VC15_SRCVCXPROJ = projects/Windows/VC15/src/curl.vcxproj.dist +VC15_SRCVCXPROJ_DEPS = $(VC15_SRCTMPL) Makefile.am src/Makefile.inc + +VC_DIST = projects/README \ + projects/build-openssl.bat \ + projects/build-wolfssl.bat \ + projects/checksrc.bat \ + projects/Windows/VC6/curl-all.dsw \ + projects/Windows/VC6/lib/libcurl.dsw \ + projects/Windows/VC6/src/curl.dsw \ + projects/Windows/VC7/curl-all.sln \ + projects/Windows/VC7/lib/libcurl.sln \ + projects/Windows/VC7/src/curl.sln \ + projects/Windows/VC7.1/curl-all.sln \ + projects/Windows/VC7.1/lib/libcurl.sln \ + projects/Windows/VC7.1/src/curl.sln \ + projects/Windows/VC8/curl-all.sln \ + projects/Windows/VC8/lib/libcurl.sln \ + projects/Windows/VC8/src/curl.sln \ + projects/Windows/VC9/curl-all.sln \ + projects/Windows/VC9/lib/libcurl.sln \ + projects/Windows/VC9/src/curl.sln \ + projects/Windows/VC10/curl-all.sln \ + projects/Windows/VC10/lib/libcurl.sln \ + projects/Windows/VC10/lib/libcurl.vcxproj.filters \ + projects/Windows/VC10/src/curl.sln \ + projects/Windows/VC10/src/curl.vcxproj.filters \ + projects/Windows/VC11/curl-all.sln \ + projects/Windows/VC11/lib/libcurl.sln \ + projects/Windows/VC11/lib/libcurl.vcxproj.filters \ + projects/Windows/VC11/src/curl.sln \ + projects/Windows/VC11/src/curl.vcxproj.filters \ + projects/Windows/VC12/curl-all.sln \ + projects/Windows/VC12/lib/libcurl.sln \ + projects/Windows/VC12/lib/libcurl.vcxproj.filters \ + projects/Windows/VC12/src/curl.sln \ + projects/Windows/VC12/src/curl.vcxproj.filters \ + projects/Windows/VC14/curl-all.sln \ + projects/Windows/VC14/lib/libcurl.sln \ + projects/Windows/VC14/lib/libcurl.vcxproj.filters \ + projects/Windows/VC14/src/curl.sln \ + projects/Windows/VC14/src/curl.vcxproj.filters \ + projects/Windows/VC15/curl-all.sln \ + projects/Windows/VC15/lib/libcurl.sln \ + projects/Windows/VC15/lib/libcurl.vcxproj.filters \ + projects/Windows/VC15/src/curl.sln \ + projects/Windows/VC15/src/curl.vcxproj.filters \ + projects/generate.bat \ + projects/wolfssl_options.h \ projects/wolfssl_override.props WINBUILD_DIST = winbuild/README.md winbuild/gen_resp_file.bat \ @@ -146,14 +180,17 @@ PLAN9_DIST = plan9/include/mkfile \ plan9/src/mkfile.inc \ plan9/src/mkfile -EXTRA_DIST = CHANGES COPYING maketgz Makefile.dist curl-config.in \ - RELEASE-NOTES buildconf libcurl.pc.in MacOSX-Framework $(CMAKE_DIST) \ - $(VC_DIST) $(WINBUILD_DIST) $(PLAN9_DIST) lib/libcurl.vers.in buildconf.bat +EXTRA_DIST = CHANGES COPYING maketgz Makefile.dist curl-config.in \ + RELEASE-NOTES buildconf libcurl.pc.in MacOSX-Framework \ + scripts/updatemanpages.pl $(CMAKE_DIST) \ + $(VC_DIST) $(WINBUILD_DIST) $(PLAN9_DIST) \ + lib/libcurl.vers.in buildconf.bat scripts/coverage.sh scripts/completion.pl -CLEANFILES = $(VC10_LIBVCXPROJ) $(VC10_SRCVCXPROJ) $(VC11_LIBVCXPROJ) \ - $(VC11_SRCVCXPROJ) $(VC12_LIBVCXPROJ) $(VC12_SRCVCXPROJ) $(VC14_LIBVCXPROJ) \ - $(VC14_SRCVCXPROJ) $(VC14_10_LIBVCXPROJ) $(VC14_10_SRCVCXPROJ) \ - $(VC14_30_LIBVCXPROJ) $(VC14_30_SRCVCXPROJ) +CLEANFILES = $(VC6_LIBDSP) $(VC6_SRCDSP) $(VC7_LIBVCPROJ) $(VC7_SRCVCPROJ) \ + $(VC71_LIBVCPROJ) $(VC71_SRCVCPROJ) $(VC8_LIBVCPROJ) $(VC8_SRCVCPROJ) \ + $(VC9_LIBVCPROJ) $(VC9_SRCVCPROJ) $(VC10_LIBVCXPROJ) $(VC10_SRCVCXPROJ) \ + $(VC11_LIBVCXPROJ) $(VC11_SRCVCXPROJ) $(VC12_LIBVCXPROJ) $(VC12_SRCVCXPROJ) \ + $(VC14_LIBVCXPROJ) $(VC14_SRCVCXPROJ) $(VC15_LIBVCXPROJ) $(VC15_SRCVCXPROJ) bin_SCRIPTS = curl-config @@ -281,13 +318,13 @@ uninstall-hook: (cd docs && $(MAKE) uninstall) (cd docs/libcurl && $(MAKE) uninstall) -ca-bundle: $(srcdir)/scripts/mk-ca-bundle.pl +ca-bundle: lib/mk-ca-bundle.pl @echo "generating a fresh ca-bundle.crt" - @perl $(srcdir)/scripts/mk-ca-bundle.pl -b -l -u lib/ca-bundle.crt + @perl $< -b -l -u lib/ca-bundle.crt -ca-firefox: $(srcdir)/scripts/firefox-db2pem.sh +ca-firefox: lib/firefox-db2pem.sh @echo "generating a fresh ca-bundle.crt" - $(srcdir)/scripts/firefox-db2pem.sh lib/ca-bundle.crt + ./lib/firefox-db2pem.sh lib/ca-bundle.crt checksrc: (cd lib && $(MAKE) checksrc) @@ -299,11 +336,13 @@ checksrc: .PHONY: vc-ide -vc-ide: $(VC10_LIBVCXPROJ_DEPS) $(VC10_SRCVCXPROJ_DEPS) \ +vc-ide: $(VC6_LIBDSP_DEPS) $(VC6_SRCDSP_DEPS) $(VC7_LIBVCPROJ_DEPS) \ + $(VC7_SRCVCPROJ_DEPS) $(VC71_LIBVCPROJ_DEPS) $(VC71_SRCVCPROJ_DEPS) \ + $(VC8_LIBVCPROJ_DEPS) $(VC8_SRCVCPROJ_DEPS) $(VC9_LIBVCPROJ_DEPS) \ + $(VC9_SRCVCPROJ_DEPS) $(VC10_LIBVCXPROJ_DEPS) $(VC10_SRCVCXPROJ_DEPS) \ $(VC11_LIBVCXPROJ_DEPS) $(VC11_SRCVCXPROJ_DEPS) $(VC12_LIBVCXPROJ_DEPS) \ $(VC12_SRCVCXPROJ_DEPS) $(VC14_LIBVCXPROJ_DEPS) $(VC14_SRCVCXPROJ_DEPS) \ - $(VC14_10_LIBVCXPROJ_DEPS) $(VC14_10_SRCVCXPROJ_DEPS) \ - $(VC14_30_LIBVCXPROJ_DEPS) $(VC14_30_SRCVCXPROJ_DEPS) + $(VC15_LIBVCXPROJ_DEPS) $(VC15_SRCVCXPROJ_DEPS) @(win32_lib_srcs='$(LIB_CFILES)'; \ win32_lib_hdrs='$(LIB_HFILES) config-win32.h'; \ win32_lib_rc='$(LIB_RCFILES)'; \ @@ -464,8 +503,8 @@ function gen_element(type, dir, file)\ printf("%s\r\n", $$0);\ }';\ \ - echo "generating '$(VC10_LIBVCXPROJ)'"; \ - awk -v proj_type=vcxproj \ + echo "generating '$(VC6_LIBDSP)'"; \ + awk -v proj_type=dsp \ -v lib_srcs="$$sorted_lib_srcs" \ -v lib_hdrs="$$sorted_lib_hdrs" \ -v lib_rc="$$win32_lib_rc" \ @@ -477,18 +516,114 @@ function gen_element(type, dir, file)\ -v lib_vssh_hdrs="$$sorted_lib_vssh_hdrs" \ -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \ -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \ - "$$awk_code" $(srcdir)/$(VC10_LIBTMPL) > $(VC10_LIBVCXPROJ) || { exit 1; }; \ + "$$awk_code" $(srcdir)/$(VC6_LIBTMPL) > $(VC6_LIBDSP) || { exit 1; }; \ \ - echo "generating '$(VC10_SRCVCXPROJ)'"; \ - awk -v proj_type=vcxproj \ + echo "generating '$(VC6_SRCDSP)'"; \ + awk -v proj_type=dsp \ -v src_srcs="$$sorted_src_srcs" \ -v src_hdrs="$$sorted_src_hdrs" \ -v src_rc="$$win32_src_rc" \ -v src_x_srcs="$$sorted_src_x_srcs" \ -v src_x_hdrs="$$sorted_src_x_hdrs" \ - "$$awk_code" $(srcdir)/$(VC10_SRCTMPL) > $(VC10_SRCVCXPROJ) || { exit 1; }; \ + "$$awk_code" $(srcdir)/$(VC6_SRCTMPL) > $(VC6_SRCDSP) || { exit 1; }; \ \ - echo "generating '$(VC11_LIBVCXPROJ)'"; \ + echo "generating '$(VC7_LIBVCPROJ)'"; \ + awk -v proj_type=vcproj1 \ + -v lib_srcs="$$sorted_lib_srcs" \ + -v lib_hdrs="$$sorted_lib_hdrs" \ + -v lib_rc="$$win32_lib_rc" \ + -v lib_vauth_srcs="$$sorted_lib_vauth_srcs" \ + -v lib_vauth_hdrs="$$sorted_lib_vauth_hdrs" \ + -v lib_vquic_srcs="$$sorted_lib_vquic_srcs" \ + -v lib_vquic_hdrs="$$sorted_lib_vquic_hdrs" \ + -v lib_vssh_srcs="$$sorted_lib_vssh_srcs" \ + -v lib_vssh_hdrs="$$sorted_lib_vssh_hdrs" \ + -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \ + -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \ + "$$awk_code" $(srcdir)/$(VC7_LIBTMPL) > $(VC7_LIBVCPROJ) || { exit 1; }; \ + \ + echo "generating '$(VC7_SRCVCPROJ)'"; \ + awk -v proj_type=vcproj1 \ + -v src_srcs="$$sorted_src_srcs" \ + -v src_hdrs="$$sorted_src_hdrs" \ + -v src_rc="$$win32_src_rc" \ + -v src_x_srcs="$$sorted_src_x_srcs" \ + -v src_x_hdrs="$$sorted_src_x_hdrs" \ + "$$awk_code" $(srcdir)/$(VC7_SRCTMPL) > $(VC7_SRCVCPROJ) || { exit 1; }; \ + \ + echo "generating '$(VC71_LIBVCPROJ)'"; \ + awk -v proj_type=vcproj1 \ + -v lib_srcs="$$sorted_lib_srcs" \ + -v lib_hdrs="$$sorted_lib_hdrs" \ + -v lib_rc="$$win32_lib_rc" \ + -v lib_vauth_srcs="$$sorted_lib_vauth_srcs" \ + -v lib_vauth_hdrs="$$sorted_lib_vauth_hdrs" \ + -v lib_vquic_srcs="$$sorted_lib_vquic_srcs" \ + -v lib_vquic_hdrs="$$sorted_lib_vquic_hdrs" \ + -v lib_vssh_srcs="$$sorted_lib_vssh_srcs" \ + -v lib_vssh_hdrs="$$sorted_lib_vssh_hdrs" \ + -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \ + -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \ + "$$awk_code" $(srcdir)/$(VC71_LIBTMPL) > $(VC71_LIBVCPROJ) || { exit 1; }; \ + \ + echo "generating '$(VC71_SRCVCPROJ)'"; \ + awk -v proj_type=vcproj1 \ + -v src_srcs="$$sorted_src_srcs" \ + -v src_hdrs="$$sorted_src_hdrs" \ + -v src_rc="$$win32_src_rc" \ + -v src_x_srcs="$$sorted_src_x_srcs" \ + -v src_x_hdrs="$$sorted_src_x_hdrs" \ + "$$awk_code" $(srcdir)/$(VC71_SRCTMPL) > $(VC71_SRCVCPROJ) || { exit 1; }; \ + \ + echo "generating '$(VC8_LIBVCPROJ)'"; \ + awk -v proj_type=vcproj2 \ + -v lib_srcs="$$sorted_lib_srcs" \ + -v lib_hdrs="$$sorted_lib_hdrs" \ + -v lib_rc="$$win32_lib_rc" \ + -v lib_vauth_srcs="$$sorted_lib_vauth_srcs" \ + -v lib_vauth_hdrs="$$sorted_lib_vauth_hdrs" \ + -v lib_vquic_srcs="$$sorted_lib_vquic_srcs" \ + -v lib_vquic_hdrs="$$sorted_lib_vquic_hdrs" \ + -v lib_vssh_srcs="$$sorted_lib_vssh_srcs" \ + -v lib_vssh_hdrs="$$sorted_lib_vssh_hdrs" \ + -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \ + -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \ + "$$awk_code" $(srcdir)/$(VC8_LIBTMPL) > $(VC8_LIBVCPROJ) || { exit 1; }; \ + \ + echo "generating '$(VC8_SRCVCPROJ)'"; \ + awk -v proj_type=vcproj2 \ + -v src_srcs="$$sorted_src_srcs" \ + -v src_hdrs="$$sorted_src_hdrs" \ + -v src_rc="$$win32_src_rc" \ + -v src_x_srcs="$$sorted_src_x_srcs" \ + -v src_x_hdrs="$$sorted_src_x_hdrs" \ + "$$awk_code" $(srcdir)/$(VC8_SRCTMPL) > $(VC8_SRCVCPROJ) || { exit 1; }; \ + \ + echo "generating '$(VC9_LIBVCPROJ)'"; \ + awk -v proj_type=vcproj2 \ + -v lib_srcs="$$sorted_lib_srcs" \ + -v lib_hdrs="$$sorted_lib_hdrs" \ + -v lib_rc="$$win32_lib_rc" \ + -v lib_vauth_srcs="$$sorted_lib_vauth_srcs" \ + -v lib_vauth_hdrs="$$sorted_lib_vauth_hdrs" \ + -v lib_vquic_srcs="$$sorted_lib_vquic_srcs" \ + -v lib_vquic_hdrs="$$sorted_lib_vquic_hdrs" \ + -v lib_vssh_srcs="$$sorted_lib_vssh_srcs" \ + -v lib_vssh_hdrs="$$sorted_lib_vssh_hdrs" \ + -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \ + -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \ + "$$awk_code" $(srcdir)/$(VC9_LIBTMPL) > $(VC9_LIBVCPROJ) || { exit 1; }; \ + \ + echo "generating '$(VC9_SRCVCPROJ)'"; \ + awk -v proj_type=vcproj2 \ + -v src_srcs="$$sorted_src_srcs" \ + -v src_hdrs="$$sorted_src_hdrs" \ + -v src_rc="$$win32_src_rc" \ + -v src_x_srcs="$$sorted_src_x_srcs" \ + -v src_x_hdrs="$$sorted_src_x_hdrs" \ + "$$awk_code" $(srcdir)/$(VC9_SRCTMPL) > $(VC9_SRCVCPROJ) || { exit 1; }; \ + \ + echo "generating '$(VC10_LIBVCXPROJ)'"; \ awk -v proj_type=vcxproj \ -v lib_srcs="$$sorted_lib_srcs" \ -v lib_hdrs="$$sorted_lib_hdrs" \ @@ -501,18 +636,18 @@ function gen_element(type, dir, file)\ -v lib_vssh_hdrs="$$sorted_lib_vssh_hdrs" \ -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \ -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \ - "$$awk_code" $(srcdir)/$(VC11_LIBTMPL) > $(VC11_LIBVCXPROJ) || { exit 1; }; \ + "$$awk_code" $(srcdir)/$(VC10_LIBTMPL) > $(VC10_LIBVCXPROJ) || { exit 1; }; \ \ - echo "generating '$(VC11_SRCVCXPROJ)'"; \ + echo "generating '$(VC10_SRCVCXPROJ)'"; \ awk -v proj_type=vcxproj \ -v src_srcs="$$sorted_src_srcs" \ -v src_hdrs="$$sorted_src_hdrs" \ -v src_rc="$$win32_src_rc" \ -v src_x_srcs="$$sorted_src_x_srcs" \ -v src_x_hdrs="$$sorted_src_x_hdrs" \ - "$$awk_code" $(srcdir)/$(VC11_SRCTMPL) > $(VC11_SRCVCXPROJ) || { exit 1; }; \ + "$$awk_code" $(srcdir)/$(VC10_SRCTMPL) > $(VC10_SRCVCXPROJ) || { exit 1; }; \ \ - echo "generating '$(VC12_LIBVCXPROJ)'"; \ + echo "generating '$(VC11_LIBVCXPROJ)'"; \ awk -v proj_type=vcxproj \ -v lib_srcs="$$sorted_lib_srcs" \ -v lib_hdrs="$$sorted_lib_hdrs" \ @@ -525,18 +660,18 @@ function gen_element(type, dir, file)\ -v lib_vssh_hdrs="$$sorted_lib_vssh_hdrs" \ -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \ -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \ - "$$awk_code" $(srcdir)/$(VC12_LIBTMPL) > $(VC12_LIBVCXPROJ) || { exit 1; }; \ + "$$awk_code" $(srcdir)/$(VC11_LIBTMPL) > $(VC11_LIBVCXPROJ) || { exit 1; }; \ \ - echo "generating '$(VC12_SRCVCXPROJ)'"; \ + echo "generating '$(VC11_SRCVCXPROJ)'"; \ awk -v proj_type=vcxproj \ -v src_srcs="$$sorted_src_srcs" \ -v src_hdrs="$$sorted_src_hdrs" \ -v src_rc="$$win32_src_rc" \ -v src_x_srcs="$$sorted_src_x_srcs" \ -v src_x_hdrs="$$sorted_src_x_hdrs" \ - "$$awk_code" $(srcdir)/$(VC12_SRCTMPL) > $(VC12_SRCVCXPROJ) || { exit 1; }; \ + "$$awk_code" $(srcdir)/$(VC11_SRCTMPL) > $(VC11_SRCVCXPROJ) || { exit 1; }; \ \ - echo "generating '$(VC14_LIBVCXPROJ)'"; \ + echo "generating '$(VC12_LIBVCXPROJ)'"; \ awk -v proj_type=vcxproj \ -v lib_srcs="$$sorted_lib_srcs" \ -v lib_hdrs="$$sorted_lib_hdrs" \ @@ -549,18 +684,18 @@ function gen_element(type, dir, file)\ -v lib_vssh_hdrs="$$sorted_lib_vssh_hdrs" \ -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \ -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \ - "$$awk_code" $(srcdir)/$(VC14_LIBTMPL) > $(VC14_LIBVCXPROJ) || { exit 1; }; \ + "$$awk_code" $(srcdir)/$(VC12_LIBTMPL) > $(VC12_LIBVCXPROJ) || { exit 1; }; \ \ - echo "generating '$(VC14_SRCVCXPROJ)'"; \ + echo "generating '$(VC12_SRCVCXPROJ)'"; \ awk -v proj_type=vcxproj \ -v src_srcs="$$sorted_src_srcs" \ -v src_hdrs="$$sorted_src_hdrs" \ -v src_rc="$$win32_src_rc" \ -v src_x_srcs="$$sorted_src_x_srcs" \ -v src_x_hdrs="$$sorted_src_x_hdrs" \ - "$$awk_code" $(srcdir)/$(VC14_SRCTMPL) > $(VC14_SRCVCXPROJ) || { exit 1; }; \ + "$$awk_code" $(srcdir)/$(VC12_SRCTMPL) > $(VC12_SRCVCXPROJ) || { exit 1; }; \ \ - echo "generating '$(VC14_10_LIBVCXPROJ)'"; \ + echo "generating '$(VC14_LIBVCXPROJ)'"; \ awk -v proj_type=vcxproj \ -v lib_srcs="$$sorted_lib_srcs" \ -v lib_hdrs="$$sorted_lib_hdrs" \ @@ -573,18 +708,18 @@ function gen_element(type, dir, file)\ -v lib_vssh_hdrs="$$sorted_lib_vssh_hdrs" \ -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \ -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \ - "$$awk_code" $(srcdir)/$(VC14_10_LIBTMPL) > $(VC14_10_LIBVCXPROJ) || { exit 1; }; \ + "$$awk_code" $(srcdir)/$(VC14_LIBTMPL) > $(VC14_LIBVCXPROJ) || { exit 1; }; \ \ - echo "generating '$(VC14_10_SRCVCXPROJ)'"; \ + echo "generating '$(VC14_SRCVCXPROJ)'"; \ awk -v proj_type=vcxproj \ -v src_srcs="$$sorted_src_srcs" \ -v src_hdrs="$$sorted_src_hdrs" \ -v src_rc="$$win32_src_rc" \ -v src_x_srcs="$$sorted_src_x_srcs" \ -v src_x_hdrs="$$sorted_src_x_hdrs" \ - "$$awk_code" $(srcdir)/$(VC14_10_SRCTMPL) > $(VC14_10_SRCVCXPROJ) || { exit 1; }; \ + "$$awk_code" $(srcdir)/$(VC14_SRCTMPL) > $(VC14_SRCVCXPROJ) || { exit 1; }; \ \ - echo "generating '$(VC14_30_LIBVCXPROJ)'"; \ + echo "generating '$(VC15_LIBVCXPROJ)'"; \ awk -v proj_type=vcxproj \ -v lib_srcs="$$sorted_lib_srcs" \ -v lib_hdrs="$$sorted_lib_hdrs" \ @@ -597,16 +732,16 @@ function gen_element(type, dir, file)\ -v lib_vssh_hdrs="$$sorted_lib_vssh_hdrs" \ -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \ -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \ - "$$awk_code" $(srcdir)/$(VC14_30_LIBTMPL) > $(VC14_30_LIBVCXPROJ) || { exit 1; }; \ + "$$awk_code" $(srcdir)/$(VC15_LIBTMPL) > $(VC15_LIBVCXPROJ) || { exit 1; }; \ \ - echo "generating '$(VC14_30_SRCVCXPROJ)'"; \ + echo "generating '$(VC15_SRCVCXPROJ)'"; \ awk -v proj_type=vcxproj \ -v src_srcs="$$sorted_src_srcs" \ -v src_hdrs="$$sorted_src_hdrs" \ -v src_rc="$$win32_src_rc" \ -v src_x_srcs="$$sorted_src_x_srcs" \ -v src_x_hdrs="$$sorted_src_x_hdrs" \ - "$$awk_code" $(srcdir)/$(VC14_30_SRCTMPL) > $(VC14_30_SRCVCXPROJ) || { exit 1; };) + "$$awk_code" $(srcdir)/$(VC15_SRCTMPL) > $(VC15_SRCVCXPROJ) || { exit 1; };) tidy: (cd src && $(MAKE) tidy) diff --git a/3rdparty/curl-7.84.0/Makefile.in b/3rdparty/curl-7.80.0/Makefile.in similarity index 85% rename from 3rdparty/curl-7.84.0/Makefile.in rename to 3rdparty/curl-7.80.0/Makefile.in index 5a960d16..cd52ff76 100644 --- a/3rdparty/curl-7.84.0/Makefile.in +++ b/3rdparty/curl-7.80.0/Makefile.in @@ -21,7 +21,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2021, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -34,8 +34,6 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # -# SPDX-License-Identifier: curl -# ########################################################################### #*************************************************************************** @@ -45,7 +43,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2021, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -58,8 +56,6 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # -# SPDX-License-Identifier: curl -# ########################################################################### #*************************************************************************** @@ -69,7 +65,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2021, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -82,13 +78,12 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # -# SPDX-License-Identifier: curl -# ########################################################################### # ./src/Makefile.inc -# Using the backslash as line continuation character might be problematic with -# some make flavours. If we ever want to change this in a portable manner then -# we should consider this idea : +# Using the backslash as line continuation character might be problematic +# with some make flavours, as Watcom's wmake showed us already. If we +# ever want to change this in a portable manner then we should consider +# this idea (posted to the libcurl list by Adam Kellas): # CSRC1 = file1.c file2.c file3.c # CSRC2 = file4.c file5.c file6.c # CSOURCES = $(CSRC1) $(CSRC2) @@ -177,7 +172,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compile_check_sizeof.m4 \ $(top_srcdir)/m4/curl-confopts.m4 \ $(top_srcdir)/m4/curl-functions.m4 \ $(top_srcdir)/m4/curl-gnutls.m4 \ - $(top_srcdir)/m4/curl-mbedtls.m4 $(top_srcdir)/m4/curl-nss.m4 \ + $(top_srcdir)/m4/curl-mbedtls.m4 \ + $(top_srcdir)/m4/curl-mesalink.m4 $(top_srcdir)/m4/curl-nss.m4 \ $(top_srcdir)/m4/curl-openssl.m4 \ $(top_srcdir)/m4/curl-override.m4 \ $(top_srcdir)/m4/curl-reentrant.m4 \ @@ -380,7 +376,6 @@ CURL_DISABLE_TFTP = @CURL_DISABLE_TFTP@ CURL_LT_SHLIB_VERSIONED_FLAVOUR = @CURL_LT_SHLIB_VERSIONED_FLAVOUR@ CURL_NETWORK_AND_TIME_LIBS = @CURL_NETWORK_AND_TIME_LIBS@ CURL_NETWORK_LIBS = @CURL_NETWORK_LIBS@ -CURL_PLIST_VERSION = @CURL_PLIST_VERSION@ CURL_WITH_MULTI_SSL = @CURL_WITH_MULTI_SSL@ CYGPATH_W = @CYGPATH_W@ DEFAULT_SSL_BACKEND = @DEFAULT_SSL_BACKEND@ @@ -398,7 +393,6 @@ ENABLE_STATIC = @ENABLE_STATIC@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ -FILECMD = @FILECMD@ FISH_FUNCTIONS_DIR = @FISH_FUNCTIONS_DIR@ GCOV = @GCOV@ GREP = @GREP@ @@ -474,7 +468,7 @@ USE_LIBRTMP = @USE_LIBRTMP@ USE_LIBSSH = @USE_LIBSSH@ USE_LIBSSH2 = @USE_LIBSSH2@ USE_MBEDTLS = @USE_MBEDTLS@ -USE_MSH3 = @USE_MSH3@ +USE_MESALINK = @USE_MESALINK@ USE_NGHTTP2 = @USE_NGHTTP2@ USE_NGHTTP3 = @USE_NGHTTP3@ USE_NGTCP2 = @USE_NGTCP2@ @@ -546,6 +540,7 @@ runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ +subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ @@ -563,10 +558,8 @@ CMAKE_DIST = \ CMake/FindBrotli.cmake \ CMake/FindCARES.cmake \ CMake/FindGSS.cmake \ - CMake/FindLibPSL.cmake \ CMake/FindLibSSH2.cmake \ CMake/FindMbedTLS.cmake \ - CMake/FindMSH3.cmake \ CMake/FindNGHTTP2.cmake \ CMake/FindNGHTTP3.cmake \ CMake/FindNGTCP2.cmake \ @@ -580,6 +573,36 @@ CMAKE_DIST = \ CMake/Utilities.cmake \ CMakeLists.txt +VC6_LIBTMPL = projects/Windows/VC6/lib/libcurl.tmpl +VC6_LIBDSP = projects/Windows/VC6/lib/libcurl.dsp.dist +VC6_LIBDSP_DEPS = $(VC6_LIBTMPL) Makefile.am lib/Makefile.inc +VC6_SRCTMPL = projects/Windows/VC6/src/curl.tmpl +VC6_SRCDSP = projects/Windows/VC6/src/curl.dsp.dist +VC6_SRCDSP_DEPS = $(VC6_SRCTMPL) Makefile.am src/Makefile.inc +VC7_LIBTMPL = projects/Windows/VC7/lib/libcurl.tmpl +VC7_LIBVCPROJ = projects/Windows/VC7/lib/libcurl.vcproj.dist +VC7_LIBVCPROJ_DEPS = $(VC7_LIBTMPL) Makefile.am lib/Makefile.inc +VC7_SRCTMPL = projects/Windows/VC7/src/curl.tmpl +VC7_SRCVCPROJ = projects/Windows/VC7/src/curl.vcproj.dist +VC7_SRCVCPROJ_DEPS = $(VC7_SRCTMPL) Makefile.am src/Makefile.inc +VC71_LIBTMPL = projects/Windows/VC7.1/lib/libcurl.tmpl +VC71_LIBVCPROJ = projects/Windows/VC7.1/lib/libcurl.vcproj.dist +VC71_LIBVCPROJ_DEPS = $(VC71_LIBTMPL) Makefile.am lib/Makefile.inc +VC71_SRCTMPL = projects/Windows/VC7.1/src/curl.tmpl +VC71_SRCVCPROJ = projects/Windows/VC7.1/src/curl.vcproj.dist +VC71_SRCVCPROJ_DEPS = $(VC71_SRCTMPL) Makefile.am src/Makefile.inc +VC8_LIBTMPL = projects/Windows/VC8/lib/libcurl.tmpl +VC8_LIBVCPROJ = projects/Windows/VC8/lib/libcurl.vcproj.dist +VC8_LIBVCPROJ_DEPS = $(VC8_LIBTMPL) Makefile.am lib/Makefile.inc +VC8_SRCTMPL = projects/Windows/VC8/src/curl.tmpl +VC8_SRCVCPROJ = projects/Windows/VC8/src/curl.vcproj.dist +VC8_SRCVCPROJ_DEPS = $(VC8_SRCTMPL) Makefile.am src/Makefile.inc +VC9_LIBTMPL = projects/Windows/VC9/lib/libcurl.tmpl +VC9_LIBVCPROJ = projects/Windows/VC9/lib/libcurl.vcproj.dist +VC9_LIBVCPROJ_DEPS = $(VC9_LIBTMPL) Makefile.am lib/Makefile.inc +VC9_SRCTMPL = projects/Windows/VC9/src/curl.tmpl +VC9_SRCVCPROJ = projects/Windows/VC9/src/curl.vcproj.dist +VC9_SRCVCPROJ_DEPS = $(VC9_SRCTMPL) Makefile.am src/Makefile.inc VC10_LIBTMPL = projects/Windows/VC10/lib/libcurl.tmpl VC10_LIBVCXPROJ = projects/Windows/VC10/lib/libcurl.vcxproj.dist VC10_LIBVCXPROJ_DEPS = $(VC10_LIBTMPL) Makefile.am lib/Makefile.inc @@ -604,54 +627,58 @@ VC14_LIBVCXPROJ_DEPS = $(VC14_LIBTMPL) Makefile.am lib/Makefile.inc VC14_SRCTMPL = projects/Windows/VC14/src/curl.tmpl VC14_SRCVCXPROJ = projects/Windows/VC14/src/curl.vcxproj.dist VC14_SRCVCXPROJ_DEPS = $(VC14_SRCTMPL) Makefile.am src/Makefile.inc -VC14_10_LIBTMPL = projects/Windows/VC14.10/lib/libcurl.tmpl -VC14_10_LIBVCXPROJ = projects/Windows/VC14.10/lib/libcurl.vcxproj.dist -VC14_10_LIBVCXPROJ_DEPS = $(VC14_10_LIBTMPL) Makefile.am lib/Makefile.inc -VC14_10_SRCTMPL = projects/Windows/VC14.10/src/curl.tmpl -VC14_10_SRCVCXPROJ = projects/Windows/VC14.10/src/curl.vcxproj.dist -VC14_10_SRCVCXPROJ_DEPS = $(VC14_10_SRCTMPL) Makefile.am src/Makefile.inc -VC14_30_LIBTMPL = projects/Windows/VC14.30/lib/libcurl.tmpl -VC14_30_LIBVCXPROJ = projects/Windows/VC14.30/lib/libcurl.vcxproj.dist -VC14_30_LIBVCXPROJ_DEPS = $(VC14_30_LIBTMPL) Makefile.am lib/Makefile.inc -VC14_30_SRCTMPL = projects/Windows/VC14.30/src/curl.tmpl -VC14_30_SRCVCXPROJ = projects/Windows/VC14.30/src/curl.vcxproj.dist -VC14_30_SRCVCXPROJ_DEPS = $(VC14_30_SRCTMPL) Makefile.am src/Makefile.inc -VC_DIST = projects/README.md \ - projects/build-openssl.bat \ - projects/build-wolfssl.bat \ - projects/checksrc.bat \ - projects/Windows/VC10/curl-all.sln \ - projects/Windows/VC10/lib/libcurl.sln \ - projects/Windows/VC10/lib/libcurl.vcxproj.filters \ - projects/Windows/VC10/src/curl.sln \ - projects/Windows/VC10/src/curl.vcxproj.filters \ - projects/Windows/VC11/curl-all.sln \ - projects/Windows/VC11/lib/libcurl.sln \ - projects/Windows/VC11/lib/libcurl.vcxproj.filters \ - projects/Windows/VC11/src/curl.sln \ - projects/Windows/VC11/src/curl.vcxproj.filters \ - projects/Windows/VC12/curl-all.sln \ - projects/Windows/VC12/lib/libcurl.sln \ - projects/Windows/VC12/lib/libcurl.vcxproj.filters \ - projects/Windows/VC12/src/curl.sln \ - projects/Windows/VC12/src/curl.vcxproj.filters \ - projects/Windows/VC14/curl-all.sln \ - projects/Windows/VC14/lib/libcurl.sln \ - projects/Windows/VC14/lib/libcurl.vcxproj.filters \ - projects/Windows/VC14/src/curl.sln \ - projects/Windows/VC14/src/curl.vcxproj.filters \ - projects/Windows/VC14.10/curl-all.sln \ - projects/Windows/VC14.10/lib/libcurl.sln \ - projects/Windows/VC14.10/lib/libcurl.vcxproj.filters \ - projects/Windows/VC14.10/src/curl.sln \ - projects/Windows/VC14.10/src/curl.vcxproj.filters \ - projects/Windows/VC14.30/curl-all.sln \ - projects/Windows/VC14.30/lib/libcurl.sln \ - projects/Windows/VC14.30/lib/libcurl.vcxproj.filters \ - projects/Windows/VC14.30/src/curl.sln \ - projects/Windows/VC14.30/src/curl.vcxproj.filters \ - projects/generate.bat \ - projects/wolfssl_options.h \ +VC15_LIBTMPL = projects/Windows/VC15/lib/libcurl.tmpl +VC15_LIBVCXPROJ = projects/Windows/VC15/lib/libcurl.vcxproj.dist +VC15_LIBVCXPROJ_DEPS = $(VC15_LIBTMPL) Makefile.am lib/Makefile.inc +VC15_SRCTMPL = projects/Windows/VC15/src/curl.tmpl +VC15_SRCVCXPROJ = projects/Windows/VC15/src/curl.vcxproj.dist +VC15_SRCVCXPROJ_DEPS = $(VC15_SRCTMPL) Makefile.am src/Makefile.inc +VC_DIST = projects/README \ + projects/build-openssl.bat \ + projects/build-wolfssl.bat \ + projects/checksrc.bat \ + projects/Windows/VC6/curl-all.dsw \ + projects/Windows/VC6/lib/libcurl.dsw \ + projects/Windows/VC6/src/curl.dsw \ + projects/Windows/VC7/curl-all.sln \ + projects/Windows/VC7/lib/libcurl.sln \ + projects/Windows/VC7/src/curl.sln \ + projects/Windows/VC7.1/curl-all.sln \ + projects/Windows/VC7.1/lib/libcurl.sln \ + projects/Windows/VC7.1/src/curl.sln \ + projects/Windows/VC8/curl-all.sln \ + projects/Windows/VC8/lib/libcurl.sln \ + projects/Windows/VC8/src/curl.sln \ + projects/Windows/VC9/curl-all.sln \ + projects/Windows/VC9/lib/libcurl.sln \ + projects/Windows/VC9/src/curl.sln \ + projects/Windows/VC10/curl-all.sln \ + projects/Windows/VC10/lib/libcurl.sln \ + projects/Windows/VC10/lib/libcurl.vcxproj.filters \ + projects/Windows/VC10/src/curl.sln \ + projects/Windows/VC10/src/curl.vcxproj.filters \ + projects/Windows/VC11/curl-all.sln \ + projects/Windows/VC11/lib/libcurl.sln \ + projects/Windows/VC11/lib/libcurl.vcxproj.filters \ + projects/Windows/VC11/src/curl.sln \ + projects/Windows/VC11/src/curl.vcxproj.filters \ + projects/Windows/VC12/curl-all.sln \ + projects/Windows/VC12/lib/libcurl.sln \ + projects/Windows/VC12/lib/libcurl.vcxproj.filters \ + projects/Windows/VC12/src/curl.sln \ + projects/Windows/VC12/src/curl.vcxproj.filters \ + projects/Windows/VC14/curl-all.sln \ + projects/Windows/VC14/lib/libcurl.sln \ + projects/Windows/VC14/lib/libcurl.vcxproj.filters \ + projects/Windows/VC14/src/curl.sln \ + projects/Windows/VC14/src/curl.vcxproj.filters \ + projects/Windows/VC15/curl-all.sln \ + projects/Windows/VC15/lib/libcurl.sln \ + projects/Windows/VC15/lib/libcurl.vcxproj.filters \ + projects/Windows/VC15/src/curl.sln \ + projects/Windows/VC15/src/curl.vcxproj.filters \ + projects/generate.bat \ + projects/wolfssl_options.h \ projects/wolfssl_override.props WINBUILD_DIST = winbuild/README.md winbuild/gen_resp_file.bat \ @@ -667,14 +694,17 @@ PLAN9_DIST = plan9/include/mkfile \ plan9/src/mkfile.inc \ plan9/src/mkfile -EXTRA_DIST = CHANGES COPYING maketgz Makefile.dist curl-config.in \ - RELEASE-NOTES buildconf libcurl.pc.in MacOSX-Framework $(CMAKE_DIST) \ - $(VC_DIST) $(WINBUILD_DIST) $(PLAN9_DIST) lib/libcurl.vers.in buildconf.bat +EXTRA_DIST = CHANGES COPYING maketgz Makefile.dist curl-config.in \ + RELEASE-NOTES buildconf libcurl.pc.in MacOSX-Framework \ + scripts/updatemanpages.pl $(CMAKE_DIST) \ + $(VC_DIST) $(WINBUILD_DIST) $(PLAN9_DIST) \ + lib/libcurl.vers.in buildconf.bat scripts/coverage.sh scripts/completion.pl -CLEANFILES = $(VC10_LIBVCXPROJ) $(VC10_SRCVCXPROJ) $(VC11_LIBVCXPROJ) \ - $(VC11_SRCVCXPROJ) $(VC12_LIBVCXPROJ) $(VC12_SRCVCXPROJ) $(VC14_LIBVCXPROJ) \ - $(VC14_SRCVCXPROJ) $(VC14_10_LIBVCXPROJ) $(VC14_10_SRCVCXPROJ) \ - $(VC14_30_LIBVCXPROJ) $(VC14_30_SRCVCXPROJ) +CLEANFILES = $(VC6_LIBDSP) $(VC6_SRCDSP) $(VC7_LIBVCPROJ) $(VC7_SRCVCPROJ) \ + $(VC71_LIBVCPROJ) $(VC71_SRCVCPROJ) $(VC8_LIBVCPROJ) $(VC8_SRCVCPROJ) \ + $(VC9_LIBVCPROJ) $(VC9_SRCVCPROJ) $(VC10_LIBVCXPROJ) $(VC10_SRCVCXPROJ) \ + $(VC11_LIBVCXPROJ) $(VC11_SRCVCXPROJ) $(VC12_LIBVCXPROJ) $(VC12_SRCVCXPROJ) \ + $(VC14_LIBVCXPROJ) $(VC14_SRCVCXPROJ) $(VC15_LIBVCXPROJ) $(VC15_SRCVCXPROJ) bin_SCRIPTS = curl-config SUBDIRS = lib src @@ -705,10 +735,10 @@ LIB_VTLS_CFILES = \ vtls/bearssl.c \ vtls/gskit.c \ vtls/gtls.c \ - vtls/hostcheck.c \ vtls/keylog.c \ vtls/mbedtls.c \ vtls/mbedtls_threadlock.c \ + vtls/mesalink.c \ vtls/nss.c \ vtls/openssl.c \ vtls/rustls.c \ @@ -716,34 +746,30 @@ LIB_VTLS_CFILES = \ vtls/schannel_verify.c \ vtls/sectransp.c \ vtls/vtls.c \ - vtls/wolfssl.c \ - vtls/x509asn1.c + vtls/wolfssl.c LIB_VTLS_HFILES = \ vtls/bearssl.h \ vtls/gskit.h \ vtls/gtls.h \ - vtls/hostcheck.h \ vtls/keylog.h \ vtls/mbedtls.h \ vtls/mbedtls_threadlock.h \ + vtls/mesalink.h \ vtls/nssg.h \ vtls/openssl.h \ vtls/rustls.h \ vtls/schannel.h \ vtls/sectransp.h \ vtls/vtls.h \ - vtls/wolfssl.h \ - vtls/x509asn1.h + vtls/wolfssl.h LIB_VQUIC_CFILES = \ - vquic/msh3.c \ vquic/ngtcp2.c \ vquic/quiche.c \ vquic/vquic.c LIB_VQUIC_HFILES = \ - vquic/msh3.h \ vquic/ngtcp2.h \ vquic/quiche.h \ vquic/vquic.h @@ -796,18 +822,16 @@ LIB_CFILES = \ escape.c \ file.c \ fileinfo.c \ - fopen.c \ formdata.c \ ftp.c \ ftplistparser.c \ getenv.c \ getinfo.c \ gopher.c \ - h2h3.c \ hash.c \ - headers.c \ hmac.c \ hostasyn.c \ + hostcheck.c \ hostip.c \ hostip4.c \ hostip6.c \ @@ -837,6 +861,7 @@ LIB_CFILES = \ mqtt.c \ multi.c \ netrc.c \ + non-ascii.c \ nonblock.c \ openldap.c \ parsedate.c \ @@ -869,7 +894,6 @@ LIB_CFILES = \ system_win32.c \ telnet.c \ tftp.c \ - timediff.c \ timeval.c \ transfer.c \ url.c \ @@ -877,7 +901,8 @@ LIB_CFILES = \ version.c \ version_win32.c \ warnless.c \ - wildcard.c + wildcard.c \ + x509asn1.c LIB_HFILES = \ altsvc.h \ @@ -924,21 +949,18 @@ LIB_HFILES = \ doh.h \ dotdot.h \ dynbuf.h \ - easy_lock.h \ easyif.h \ easyoptions.h \ escape.h \ file.h \ fileinfo.h \ - fopen.h \ formdata.h \ ftp.h \ ftplistparser.h \ getinfo.h \ gopher.h \ - h2h3.h \ hash.h \ - headers.h \ + hostcheck.h \ hostip.h \ hsts.h \ http.h \ @@ -960,6 +982,7 @@ LIB_HFILES = \ multihandle.h \ multiif.h \ netrc.h \ + non-ascii.h \ nonblock.h \ parsedate.h \ pingpong.h \ @@ -992,7 +1015,6 @@ LIB_HFILES = \ system_win32.h \ telnet.h \ tftp.h \ - timediff.h \ timeval.h \ transfer.h \ url.h \ @@ -1000,7 +1022,8 @@ LIB_HFILES = \ urldata.h \ version_win32.h \ warnless.h \ - wildcard.h + wildcard.h \ + x509asn1.h LIB_RCFILES = libcurl.rc CSOURCES = $(LIB_CFILES) $(LIB_VAUTH_CFILES) $(LIB_VTLS_CFILES) \ @@ -1014,7 +1037,6 @@ HHEADERS = $(LIB_HFILES) $(LIB_VAUTH_HFILES) $(LIB_VTLS_HFILES) \ # the official API, but we re-use the code here to avoid duplication. CURLX_CFILES = \ ../lib/strtoofft.c \ - ../lib/timediff.c \ ../lib/nonblock.c \ ../lib/warnless.c \ ../lib/curl_ctype.c \ @@ -1025,7 +1047,6 @@ CURLX_CFILES = \ CURLX_HFILES = \ ../lib/curl_setup.h \ ../lib/strtoofft.h \ - ../lib/timediff.h \ ../lib/nonblock.h \ ../lib/warnless.h \ ../lib/curl_ctype.h \ @@ -1044,16 +1065,17 @@ CURL_CFILES = \ tool_cb_see.c \ tool_cb_wrt.c \ tool_cfgable.c \ + tool_convert.c \ tool_dirhie.c \ tool_doswin.c \ tool_easysrc.c \ tool_filetime.c \ - tool_findfile.c \ tool_formparse.c \ tool_getparam.c \ tool_getpass.c \ tool_help.c \ tool_helpers.c \ + tool_homedir.c \ tool_hugehelp.c \ tool_libinfo.c \ tool_listhelp.c \ @@ -1086,16 +1108,17 @@ CURL_HFILES = \ tool_cb_see.h \ tool_cb_wrt.h \ tool_cfgable.h \ + tool_convert.h \ tool_dirhie.h \ tool_doswin.h \ tool_easysrc.h \ tool_filetime.h \ - tool_findfile.h \ tool_formparse.h \ tool_getparam.h \ tool_getpass.h \ tool_help.h \ tool_helpers.h \ + tool_homedir.h \ tool_hugehelp.h \ tool_libinfo.h \ tool_main.h \ @@ -1778,13 +1801,13 @@ uninstall-hook: (cd docs && $(MAKE) uninstall) (cd docs/libcurl && $(MAKE) uninstall) -ca-bundle: $(srcdir)/scripts/mk-ca-bundle.pl +ca-bundle: lib/mk-ca-bundle.pl @echo "generating a fresh ca-bundle.crt" - @perl $(srcdir)/scripts/mk-ca-bundle.pl -b -l -u lib/ca-bundle.crt + @perl $< -b -l -u lib/ca-bundle.crt -ca-firefox: $(srcdir)/scripts/firefox-db2pem.sh +ca-firefox: lib/firefox-db2pem.sh @echo "generating a fresh ca-bundle.crt" - $(srcdir)/scripts/firefox-db2pem.sh lib/ca-bundle.crt + ./lib/firefox-db2pem.sh lib/ca-bundle.crt checksrc: (cd lib && $(MAKE) checksrc) @@ -1796,11 +1819,13 @@ checksrc: .PHONY: vc-ide -vc-ide: $(VC10_LIBVCXPROJ_DEPS) $(VC10_SRCVCXPROJ_DEPS) \ +vc-ide: $(VC6_LIBDSP_DEPS) $(VC6_SRCDSP_DEPS) $(VC7_LIBVCPROJ_DEPS) \ + $(VC7_SRCVCPROJ_DEPS) $(VC71_LIBVCPROJ_DEPS) $(VC71_SRCVCPROJ_DEPS) \ + $(VC8_LIBVCPROJ_DEPS) $(VC8_SRCVCPROJ_DEPS) $(VC9_LIBVCPROJ_DEPS) \ + $(VC9_SRCVCPROJ_DEPS) $(VC10_LIBVCXPROJ_DEPS) $(VC10_SRCVCXPROJ_DEPS) \ $(VC11_LIBVCXPROJ_DEPS) $(VC11_SRCVCXPROJ_DEPS) $(VC12_LIBVCXPROJ_DEPS) \ $(VC12_SRCVCXPROJ_DEPS) $(VC14_LIBVCXPROJ_DEPS) $(VC14_SRCVCXPROJ_DEPS) \ - $(VC14_10_LIBVCXPROJ_DEPS) $(VC14_10_SRCVCXPROJ_DEPS) \ - $(VC14_30_LIBVCXPROJ_DEPS) $(VC14_30_SRCVCXPROJ_DEPS) + $(VC15_LIBVCXPROJ_DEPS) $(VC15_SRCVCXPROJ_DEPS) @(win32_lib_srcs='$(LIB_CFILES)'; \ win32_lib_hdrs='$(LIB_HFILES) config-win32.h'; \ win32_lib_rc='$(LIB_RCFILES)'; \ @@ -1961,8 +1986,8 @@ function gen_element(type, dir, file)\ printf("%s\r\n", $$0);\ }';\ \ - echo "generating '$(VC10_LIBVCXPROJ)'"; \ - awk -v proj_type=vcxproj \ + echo "generating '$(VC6_LIBDSP)'"; \ + awk -v proj_type=dsp \ -v lib_srcs="$$sorted_lib_srcs" \ -v lib_hdrs="$$sorted_lib_hdrs" \ -v lib_rc="$$win32_lib_rc" \ @@ -1974,18 +1999,114 @@ function gen_element(type, dir, file)\ -v lib_vssh_hdrs="$$sorted_lib_vssh_hdrs" \ -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \ -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \ - "$$awk_code" $(srcdir)/$(VC10_LIBTMPL) > $(VC10_LIBVCXPROJ) || { exit 1; }; \ + "$$awk_code" $(srcdir)/$(VC6_LIBTMPL) > $(VC6_LIBDSP) || { exit 1; }; \ \ - echo "generating '$(VC10_SRCVCXPROJ)'"; \ - awk -v proj_type=vcxproj \ + echo "generating '$(VC6_SRCDSP)'"; \ + awk -v proj_type=dsp \ -v src_srcs="$$sorted_src_srcs" \ -v src_hdrs="$$sorted_src_hdrs" \ -v src_rc="$$win32_src_rc" \ -v src_x_srcs="$$sorted_src_x_srcs" \ -v src_x_hdrs="$$sorted_src_x_hdrs" \ - "$$awk_code" $(srcdir)/$(VC10_SRCTMPL) > $(VC10_SRCVCXPROJ) || { exit 1; }; \ + "$$awk_code" $(srcdir)/$(VC6_SRCTMPL) > $(VC6_SRCDSP) || { exit 1; }; \ \ - echo "generating '$(VC11_LIBVCXPROJ)'"; \ + echo "generating '$(VC7_LIBVCPROJ)'"; \ + awk -v proj_type=vcproj1 \ + -v lib_srcs="$$sorted_lib_srcs" \ + -v lib_hdrs="$$sorted_lib_hdrs" \ + -v lib_rc="$$win32_lib_rc" \ + -v lib_vauth_srcs="$$sorted_lib_vauth_srcs" \ + -v lib_vauth_hdrs="$$sorted_lib_vauth_hdrs" \ + -v lib_vquic_srcs="$$sorted_lib_vquic_srcs" \ + -v lib_vquic_hdrs="$$sorted_lib_vquic_hdrs" \ + -v lib_vssh_srcs="$$sorted_lib_vssh_srcs" \ + -v lib_vssh_hdrs="$$sorted_lib_vssh_hdrs" \ + -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \ + -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \ + "$$awk_code" $(srcdir)/$(VC7_LIBTMPL) > $(VC7_LIBVCPROJ) || { exit 1; }; \ + \ + echo "generating '$(VC7_SRCVCPROJ)'"; \ + awk -v proj_type=vcproj1 \ + -v src_srcs="$$sorted_src_srcs" \ + -v src_hdrs="$$sorted_src_hdrs" \ + -v src_rc="$$win32_src_rc" \ + -v src_x_srcs="$$sorted_src_x_srcs" \ + -v src_x_hdrs="$$sorted_src_x_hdrs" \ + "$$awk_code" $(srcdir)/$(VC7_SRCTMPL) > $(VC7_SRCVCPROJ) || { exit 1; }; \ + \ + echo "generating '$(VC71_LIBVCPROJ)'"; \ + awk -v proj_type=vcproj1 \ + -v lib_srcs="$$sorted_lib_srcs" \ + -v lib_hdrs="$$sorted_lib_hdrs" \ + -v lib_rc="$$win32_lib_rc" \ + -v lib_vauth_srcs="$$sorted_lib_vauth_srcs" \ + -v lib_vauth_hdrs="$$sorted_lib_vauth_hdrs" \ + -v lib_vquic_srcs="$$sorted_lib_vquic_srcs" \ + -v lib_vquic_hdrs="$$sorted_lib_vquic_hdrs" \ + -v lib_vssh_srcs="$$sorted_lib_vssh_srcs" \ + -v lib_vssh_hdrs="$$sorted_lib_vssh_hdrs" \ + -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \ + -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \ + "$$awk_code" $(srcdir)/$(VC71_LIBTMPL) > $(VC71_LIBVCPROJ) || { exit 1; }; \ + \ + echo "generating '$(VC71_SRCVCPROJ)'"; \ + awk -v proj_type=vcproj1 \ + -v src_srcs="$$sorted_src_srcs" \ + -v src_hdrs="$$sorted_src_hdrs" \ + -v src_rc="$$win32_src_rc" \ + -v src_x_srcs="$$sorted_src_x_srcs" \ + -v src_x_hdrs="$$sorted_src_x_hdrs" \ + "$$awk_code" $(srcdir)/$(VC71_SRCTMPL) > $(VC71_SRCVCPROJ) || { exit 1; }; \ + \ + echo "generating '$(VC8_LIBVCPROJ)'"; \ + awk -v proj_type=vcproj2 \ + -v lib_srcs="$$sorted_lib_srcs" \ + -v lib_hdrs="$$sorted_lib_hdrs" \ + -v lib_rc="$$win32_lib_rc" \ + -v lib_vauth_srcs="$$sorted_lib_vauth_srcs" \ + -v lib_vauth_hdrs="$$sorted_lib_vauth_hdrs" \ + -v lib_vquic_srcs="$$sorted_lib_vquic_srcs" \ + -v lib_vquic_hdrs="$$sorted_lib_vquic_hdrs" \ + -v lib_vssh_srcs="$$sorted_lib_vssh_srcs" \ + -v lib_vssh_hdrs="$$sorted_lib_vssh_hdrs" \ + -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \ + -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \ + "$$awk_code" $(srcdir)/$(VC8_LIBTMPL) > $(VC8_LIBVCPROJ) || { exit 1; }; \ + \ + echo "generating '$(VC8_SRCVCPROJ)'"; \ + awk -v proj_type=vcproj2 \ + -v src_srcs="$$sorted_src_srcs" \ + -v src_hdrs="$$sorted_src_hdrs" \ + -v src_rc="$$win32_src_rc" \ + -v src_x_srcs="$$sorted_src_x_srcs" \ + -v src_x_hdrs="$$sorted_src_x_hdrs" \ + "$$awk_code" $(srcdir)/$(VC8_SRCTMPL) > $(VC8_SRCVCPROJ) || { exit 1; }; \ + \ + echo "generating '$(VC9_LIBVCPROJ)'"; \ + awk -v proj_type=vcproj2 \ + -v lib_srcs="$$sorted_lib_srcs" \ + -v lib_hdrs="$$sorted_lib_hdrs" \ + -v lib_rc="$$win32_lib_rc" \ + -v lib_vauth_srcs="$$sorted_lib_vauth_srcs" \ + -v lib_vauth_hdrs="$$sorted_lib_vauth_hdrs" \ + -v lib_vquic_srcs="$$sorted_lib_vquic_srcs" \ + -v lib_vquic_hdrs="$$sorted_lib_vquic_hdrs" \ + -v lib_vssh_srcs="$$sorted_lib_vssh_srcs" \ + -v lib_vssh_hdrs="$$sorted_lib_vssh_hdrs" \ + -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \ + -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \ + "$$awk_code" $(srcdir)/$(VC9_LIBTMPL) > $(VC9_LIBVCPROJ) || { exit 1; }; \ + \ + echo "generating '$(VC9_SRCVCPROJ)'"; \ + awk -v proj_type=vcproj2 \ + -v src_srcs="$$sorted_src_srcs" \ + -v src_hdrs="$$sorted_src_hdrs" \ + -v src_rc="$$win32_src_rc" \ + -v src_x_srcs="$$sorted_src_x_srcs" \ + -v src_x_hdrs="$$sorted_src_x_hdrs" \ + "$$awk_code" $(srcdir)/$(VC9_SRCTMPL) > $(VC9_SRCVCPROJ) || { exit 1; }; \ + \ + echo "generating '$(VC10_LIBVCXPROJ)'"; \ awk -v proj_type=vcxproj \ -v lib_srcs="$$sorted_lib_srcs" \ -v lib_hdrs="$$sorted_lib_hdrs" \ @@ -1998,18 +2119,18 @@ function gen_element(type, dir, file)\ -v lib_vssh_hdrs="$$sorted_lib_vssh_hdrs" \ -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \ -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \ - "$$awk_code" $(srcdir)/$(VC11_LIBTMPL) > $(VC11_LIBVCXPROJ) || { exit 1; }; \ + "$$awk_code" $(srcdir)/$(VC10_LIBTMPL) > $(VC10_LIBVCXPROJ) || { exit 1; }; \ \ - echo "generating '$(VC11_SRCVCXPROJ)'"; \ + echo "generating '$(VC10_SRCVCXPROJ)'"; \ awk -v proj_type=vcxproj \ -v src_srcs="$$sorted_src_srcs" \ -v src_hdrs="$$sorted_src_hdrs" \ -v src_rc="$$win32_src_rc" \ -v src_x_srcs="$$sorted_src_x_srcs" \ -v src_x_hdrs="$$sorted_src_x_hdrs" \ - "$$awk_code" $(srcdir)/$(VC11_SRCTMPL) > $(VC11_SRCVCXPROJ) || { exit 1; }; \ + "$$awk_code" $(srcdir)/$(VC10_SRCTMPL) > $(VC10_SRCVCXPROJ) || { exit 1; }; \ \ - echo "generating '$(VC12_LIBVCXPROJ)'"; \ + echo "generating '$(VC11_LIBVCXPROJ)'"; \ awk -v proj_type=vcxproj \ -v lib_srcs="$$sorted_lib_srcs" \ -v lib_hdrs="$$sorted_lib_hdrs" \ @@ -2022,18 +2143,18 @@ function gen_element(type, dir, file)\ -v lib_vssh_hdrs="$$sorted_lib_vssh_hdrs" \ -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \ -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \ - "$$awk_code" $(srcdir)/$(VC12_LIBTMPL) > $(VC12_LIBVCXPROJ) || { exit 1; }; \ + "$$awk_code" $(srcdir)/$(VC11_LIBTMPL) > $(VC11_LIBVCXPROJ) || { exit 1; }; \ \ - echo "generating '$(VC12_SRCVCXPROJ)'"; \ + echo "generating '$(VC11_SRCVCXPROJ)'"; \ awk -v proj_type=vcxproj \ -v src_srcs="$$sorted_src_srcs" \ -v src_hdrs="$$sorted_src_hdrs" \ -v src_rc="$$win32_src_rc" \ -v src_x_srcs="$$sorted_src_x_srcs" \ -v src_x_hdrs="$$sorted_src_x_hdrs" \ - "$$awk_code" $(srcdir)/$(VC12_SRCTMPL) > $(VC12_SRCVCXPROJ) || { exit 1; }; \ + "$$awk_code" $(srcdir)/$(VC11_SRCTMPL) > $(VC11_SRCVCXPROJ) || { exit 1; }; \ \ - echo "generating '$(VC14_LIBVCXPROJ)'"; \ + echo "generating '$(VC12_LIBVCXPROJ)'"; \ awk -v proj_type=vcxproj \ -v lib_srcs="$$sorted_lib_srcs" \ -v lib_hdrs="$$sorted_lib_hdrs" \ @@ -2046,18 +2167,18 @@ function gen_element(type, dir, file)\ -v lib_vssh_hdrs="$$sorted_lib_vssh_hdrs" \ -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \ -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \ - "$$awk_code" $(srcdir)/$(VC14_LIBTMPL) > $(VC14_LIBVCXPROJ) || { exit 1; }; \ + "$$awk_code" $(srcdir)/$(VC12_LIBTMPL) > $(VC12_LIBVCXPROJ) || { exit 1; }; \ \ - echo "generating '$(VC14_SRCVCXPROJ)'"; \ + echo "generating '$(VC12_SRCVCXPROJ)'"; \ awk -v proj_type=vcxproj \ -v src_srcs="$$sorted_src_srcs" \ -v src_hdrs="$$sorted_src_hdrs" \ -v src_rc="$$win32_src_rc" \ -v src_x_srcs="$$sorted_src_x_srcs" \ -v src_x_hdrs="$$sorted_src_x_hdrs" \ - "$$awk_code" $(srcdir)/$(VC14_SRCTMPL) > $(VC14_SRCVCXPROJ) || { exit 1; }; \ + "$$awk_code" $(srcdir)/$(VC12_SRCTMPL) > $(VC12_SRCVCXPROJ) || { exit 1; }; \ \ - echo "generating '$(VC14_10_LIBVCXPROJ)'"; \ + echo "generating '$(VC14_LIBVCXPROJ)'"; \ awk -v proj_type=vcxproj \ -v lib_srcs="$$sorted_lib_srcs" \ -v lib_hdrs="$$sorted_lib_hdrs" \ @@ -2070,18 +2191,18 @@ function gen_element(type, dir, file)\ -v lib_vssh_hdrs="$$sorted_lib_vssh_hdrs" \ -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \ -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \ - "$$awk_code" $(srcdir)/$(VC14_10_LIBTMPL) > $(VC14_10_LIBVCXPROJ) || { exit 1; }; \ + "$$awk_code" $(srcdir)/$(VC14_LIBTMPL) > $(VC14_LIBVCXPROJ) || { exit 1; }; \ \ - echo "generating '$(VC14_10_SRCVCXPROJ)'"; \ + echo "generating '$(VC14_SRCVCXPROJ)'"; \ awk -v proj_type=vcxproj \ -v src_srcs="$$sorted_src_srcs" \ -v src_hdrs="$$sorted_src_hdrs" \ -v src_rc="$$win32_src_rc" \ -v src_x_srcs="$$sorted_src_x_srcs" \ -v src_x_hdrs="$$sorted_src_x_hdrs" \ - "$$awk_code" $(srcdir)/$(VC14_10_SRCTMPL) > $(VC14_10_SRCVCXPROJ) || { exit 1; }; \ + "$$awk_code" $(srcdir)/$(VC14_SRCTMPL) > $(VC14_SRCVCXPROJ) || { exit 1; }; \ \ - echo "generating '$(VC14_30_LIBVCXPROJ)'"; \ + echo "generating '$(VC15_LIBVCXPROJ)'"; \ awk -v proj_type=vcxproj \ -v lib_srcs="$$sorted_lib_srcs" \ -v lib_hdrs="$$sorted_lib_hdrs" \ @@ -2094,16 +2215,16 @@ function gen_element(type, dir, file)\ -v lib_vssh_hdrs="$$sorted_lib_vssh_hdrs" \ -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \ -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \ - "$$awk_code" $(srcdir)/$(VC14_30_LIBTMPL) > $(VC14_30_LIBVCXPROJ) || { exit 1; }; \ + "$$awk_code" $(srcdir)/$(VC15_LIBTMPL) > $(VC15_LIBVCXPROJ) || { exit 1; }; \ \ - echo "generating '$(VC14_30_SRCVCXPROJ)'"; \ + echo "generating '$(VC15_SRCVCXPROJ)'"; \ awk -v proj_type=vcxproj \ -v src_srcs="$$sorted_src_srcs" \ -v src_hdrs="$$sorted_src_hdrs" \ -v src_rc="$$win32_src_rc" \ -v src_x_srcs="$$sorted_src_x_srcs" \ -v src_x_hdrs="$$sorted_src_x_hdrs" \ - "$$awk_code" $(srcdir)/$(VC14_30_SRCTMPL) > $(VC14_30_SRCVCXPROJ) || { exit 1; };) + "$$awk_code" $(srcdir)/$(VC15_SRCTMPL) > $(VC15_SRCVCXPROJ) || { exit 1; };) tidy: (cd src && $(MAKE) tidy) diff --git a/3rdparty/curl-7.84.0/README b/3rdparty/curl-7.80.0/README similarity index 100% rename from 3rdparty/curl-7.84.0/README rename to 3rdparty/curl-7.80.0/README diff --git a/3rdparty/curl-7.80.0/RELEASE-NOTES b/3rdparty/curl-7.80.0/RELEASE-NOTES new file mode 100644 index 00000000..2dcccb1c --- /dev/null +++ b/3rdparty/curl-7.80.0/RELEASE-NOTES @@ -0,0 +1,287 @@ +curl and libcurl 7.80.0 + + Public curl releases: 204 + Command line options: 243 + curl_easy_setopt() options: 294 + Public functions in libcurl: 86 + Contributors: 2533 + +This release includes the following changes: + + o CURLOPT_MAXLIFETIME_CONN: maximum allowed lifetime for conn reuse [25] + o CURLOPT_PREREQFUNCTION: add new callback [17] + o libssh2: add SHA256 fingerprint support [4] + o urlapi: add curl_url_strerror() [21] + o urlapi: support UNC paths in file: URLs on Windows [20] + o wolfssl: allow setting of groups/curves [22] + +This release includes the following bugfixes: + + o .github: retry macos "brew install" command on failure [125] + o aws-sigv4: make signature work when post data is binary [68] + o BINDINGS: URL updates [30] + o build: remove checks for WinSock 1 [36] + o c-hyper: don't abort CONNECT responses early when auth-in-progress [71] + o c-hyper: make Curl_http propagate errors better [50] + o c-hyper: make CURLOPT_SUPPRESS_CONNECT_HEADERS work [97] + o c-hyper: make test 217 run [74] + o c-hyper: use hyper_request_set_uri_parts to make h2 better [39] + o checksrc: ignore preprocessor lines [64] + o CI/makefiles: introduce dedicated test target [34] + o ci: update Lift config to match requirements of curl build [1] + o cirrus: remove FreeBSD 11.4 from the matrix [62] + o cirrus: switch to openldap24-client [63] + o cleanup: constify unmodified static structs [2] + o cmake: add CURL_ENABLE_SSL option [46] + o cmake: fix error getting LOCATION property on non-imported target [59] + o CMake: restore support for SecureTransport on iOS [103] + o cmake: with OpenSSL, define OPENSSL_SUPPRESS_DEPRECATED [14] + o cmdline-opts: made the 'Added:' field mandatory [37] + o configure.ac: replace krb5-config with pkg-config [80] + o configure: when hyper is selected, deselect nghttp2 [94] + o connect: use sysaddr_un from sys/un.h or custom-defined for windows [23] + o curl-confopts.m4: remove --enable/disable-hidden-symbols [70] + o curl-openssl.m4: modify library order for openssl linking [40] + o curl-openssl: pass argument to sed single-quoted [15] + o curl.1: remove mentions of really old version changes [38] + o curl: actually append "-" to --range without number only [57] + o curl: correct grammar in generated libcurl code [53] + o curl: print help descriptions in an aligned right column [16] + o curl_gssapi: fix link error on macOS Monterey [55] + o curl_multi_socket_action.3: add a "RETURN VALUE" section [106] + o curl_ntlm_core: use OpenSSL only if DES is available [42] + o Curl_updateconninfo: store addresses for QUIC connections too [90] + o CURLOPT_ALTSVC_CTRL.3: mention conn reuse is preferred [126] + o CURLOPT_HSTSWRITEFUNCTION.3: using CURLOPT_HSTS_CTRL is required [114] + o CURLOPT_HTTPHEADER.3: add descripion for specific headers [35] + o docs/HTTP3: improve build instructions [102] + o docs/Makefile.am: repair 'make html' [52] + o docs: fix typo in CURLOPT_TRAILERFUNCTION example [93] + o docs: provide "RETURN VALUE" section for more func manpages [105] + o docs: reduce use of "very" [107] + o doh: remove experimental code for DoH with GET [61] + o examples/htmltidy: correct wrong printf() use [66] + o examples/imap-append: fix end-of-data check [7] + o ftp: make the MKD retry to retry once per directory [113] + o gen.pl: insert the current date and version in generated man page [11] + o gen.pl: replace leading single quotes with \(aq [110] + o http2: make getsock not wait for write if there's no remote window [56] + o HTTP3: fix the HTTP/3 Explained book link [27] + o http: fix Basic auth with empty name field in URL [24] + o http: reject HTTP response codes < 100 [92] + o http: remove assert that breaks hyper [47] + o http: set content length earlier [67] + o http_proxy: make hyper CONNECT() return the correct error code [51] + o http_proxy: multiple CONNECT with hyper done better [78] + o hyper: disable test 1294 since hyper doesn't allow such crazy headers [96] + o hyper: does not support disabling CURLOPT_HTTP_TRANSFER_DECODING [72] + o hyper: pass the CONNECT line to the debug callback [79] + o imap: display quota information [115] + o INSTALL: update symbol hiding option [77] + o lib/mk-ca-bundle.pl: skip certs passed Not Valid After date [18] + o lib: avoid fallthrough cases in switch statements [33] + o libcurl.rc: switch out the copyright symbol for plain ASCII [5] + o libssh2: Get the version at runtime if possible [12] + o limit-rate.d: this is average over several seconds [119] + o llist: remove redundant code, branch will not be executed [10] + o Makefile.m32: fix to not require OpenSSL with -libssh2 or -rtmp options [100] + o maketgz: redirect updatemanpages.pl output to /dev/null + o man pages: require all to use the same section header order [101] + o manpage: adjust the asterisk in some SYNOPSIS sections [82] + o md5: fix compilation with OpenSSL 3.0 API [43] + o misc: fix a few issues on MidnightBSD [28] + o misc: fix typos in docs and comments [3] + o ngtcp2: advertise h3 as well as h3-29 [109] + o ngtcp2: compile with the latest nghttp3 [117] + o ngtcp2: specify the missing required callback functions [108] + o ngtcp2: use latest QUIC TLS RFC9001 [122] + o NTLM: use DES_set_key_unchecked with OpenSSL [13] + o openssl: if verifypeer is not requested, skip the CA loading [69] + o openssl: with OpenSSL 1.1.0+ a failed RAND_status means goaway [44] + o Revert "src/tool_filetime: disable -Wformat on mingw for this file" [88] + o sasl: binary messages [31] + o schannel: fix memory leak due to failed SSL connection [89] + o scripts/delta: count command line options in the new file + o sendf: accept zero-length data in Curl_client_write() [95] + o sha256: use high-level EVP interface for OpenSSL [41] + o smooth-gtk-thread.c: enhance the mutex lock use [112] + o sws: fix memory leak on exit [49] + o test1160: edited to work with hyper [83] + o test1173: make manpage-syntax.pl spot \n errors in examples + o test1185: verify checksrc [58] + o test1266/1267: disabled on hyper: no HTTP/0.9 support [99] + o test1287: make work on hyper [98] + o test207: accept a different error code for hyper [76] + o test262: don't attempt with hyper [73] + o test552: updated to work with hyper [87] + o test559: add 'HTTP' in keywords [86] + o tests/smbserver.py: fix compatibility with impacket 0.9.23+ [104] + o tests: add Schannel-specific tests and disable unsupported ones [91] + o tests: disable test 2043 [54] + o tests: kill some test servers afterwards to avoid locked logfiles [111] + o tests: use python3 in test 1451 [48] + o tls: remove newline from three infof() calls [85] + o tool_cb_prg: make resumed upload progress bar show better [9] + o tool_listhelp: easier generated with gen.pl [19] + o tool_main: fix typo in comment [29] + o tool_operate: a failed etag save now only fails that transfer [124] + o URL-SYNTAX: add IMAP UID SEARCH example [81] + o url: check the return value of curl_url() [75] + o url: set "k->size" -1 at start of request [60] + o urlapi: skip a strlen(), pass in zero [65] + o urlapi: URL decode percent-encoded host names [26] + o version_win32: use actual version instead of manifested version [45] + o vtls: Fix a memory leak if an SSL session cannot be added to the cache [8] + o wolfssl: use for SHA256, MD4, MD5, and setting DES odd parity [32] + o zuul: pin the quiche build to use an older cmake-rs [84] + +This release includes the following known bugs: + + o see docs/KNOWN_BUGS (https://curl.se/docs/knownbugs.html) + +This release would not have looked like this without help, code, reports and +advice from friends like these: + + 8U61ife on github, a1346054 on github, Abhinav Singh, Alexander Chuykov, + Alexander Kanavin, Amaury Denoyelle, Anthony Hu, Axel Morawietz, + beslick5 on github, billionai on github, Bo Anderson, Boris Rasin, + Dan Fandrich, Daniel Gustafsson, Daniel Stenberg, David Cook, David Hu, + Earnestly on github, Eddie Lumpkin, Érico Nogueira, Erik Stenlund, + Gisle Vanem, Gleb Ivanovsky, Godwin Stewart, h1zzz on github, Harry Sintonen, + Hayden Roche, Jakub Zakrzewski, Jan Mazur, Jeffrey Tolar, Jerome Mao, + Joel Depooter, Jonathan Cardoso Machado, Josip Medved, Jun-ya Kato, + Kerem Kat, Kevin Burke, Kirill Efimov, Lucas Holt, Malik Idrees Hasan Khan, + Marcel Raad, Marc Hörsken, Mats Lindestam, Max Dymond, Michael Afanasiev, + Michael Baentsch, Michael Kaufmann, Momoka Yamamoto, Noam Moshe, + orycho on github, Patrick Monnerat, Rafał Mikrut, Randall S. Becker, + Raul Onitza-Klugman, Ray Satiro, Ricardo Martins, Rick Lane, + Rikard Falkeborn, Roger Young, Roy Li, ryancaicse on github, Ryan Mast, + Samuel Henrique, Sean Molenaar, Sergey Markelov, Sergio Durigan Junior, + sergio-nsk on github, Sharon Brizinov, Stathis Kapnidis, + Steini2000 on github, Tatsuhiro Tsujikawa, Thomas M. DuBuisson, + tlahn on github, Viktor Szakats, Vitaly Varyvdin, Wyatt O'Day, + x2018 on github, Борис Верховский, + (78 contributors) + +References to bug reports and discussions on issues: + + [1] = https://curl.se/bug/?i=7761 + [2] = https://curl.se/bug/?i=7759 + [3] = https://curl.se/bug/?i=7747 + [4] = https://curl.se/bug/?i=7646 + [5] = https://curl.se/bug/?i=7765 + [7] = https://curl.se/bug/?i=7774 + [8] = https://curl.se/bug/?i=7683 + [9] = https://curl.se/bug/?i=7760 + [10] = https://curl.se/bug/?i=7770 + [11] = https://curl.se/bug/?i=7782 + [12] = https://curl.se/bug/?i=7768 + [13] = https://curl.se/bug/?i=7779 + [14] = https://curl.se/bug/?i=7767 + [15] = https://curl.se/bug/?i=7758 + [16] = https://curl.se/bug/?i=7792 + [17] = https://curl.se/bug/?i=7477 + [18] = https://curl.se/bug/?i=7801 + [19] = https://curl.se/bug/?i=7787 + [20] = https://curl.se/bug/?i=7366 + [21] = https://curl.se/bug/?i=7605 + [22] = https://curl.se/bug/?i=7728 + [23] = https://curl.se/bug/?i=7737 + [24] = https://curl.se/bug/?i=7819 + [25] = https://curl.se/mail/lib-2021-09/0058.html + [26] = https://curl.se/bug/?i=7830 + [27] = https://curl.se/bug/?i=7813 + [28] = https://curl.se/bug/?i=7812 + [29] = https://curl.se/bug/?i=7811 + [30] = https://curl.se/bug/?i=7809 + [31] = https://curl.se/bug/?i=6930 + [32] = https://curl.se/bug/?i=7806 + [33] = https://curl.se/bug/?i=7322 + [34] = https://curl.se/bug/?i=7785 + [35] = https://curl.se/bug/?i=7829 + [36] = https://curl.se/bug/?i=7778 + [37] = https://curl.se/bug/?i=7786 + [38] = https://curl.se/bug/?i=7786 + [39] = https://curl.se/bug/?i=7679 + [40] = https://curl.se/bug/?i=7826 + [41] = https://curl.se/bug/?i=7808 + [42] = https://curl.se/bug/?i=7808 + [43] = https://curl.se/bug/?i=7808 + [44] = https://curl.se/bug/?i=7840 + [45] = https://curl.se/bug/?i=7742 + [46] = https://curl.se/bug/?i=7822 + [47] = https://curl.se/bug/?i=7852 + [48] = https://curl.se/bug/?i=7899 + [49] = https://curl.se/bug/?i=7849 + [50] = https://curl.se/bug/?i=7851 + [51] = https://curl.se/bug/?i=7825 + [52] = https://curl.se/bug/?i=7853 + [53] = https://curl.se/bug/?i=7802 + [54] = https://curl.se/bug/?i=7845 + [55] = https://curl.se/bug/?i=7657 + [56] = https://curl.se/bug/?i=7821 + [57] = https://curl.se/bug/?i=7837 + [58] = https://curl.se/bug/?i=7866 + [59] = https://curl.se/bug/?i=7885 + [60] = https://curl.se/bug/?i=7871 + [61] = https://curl.se/bug/?i=7870 + [62] = https://curl.se/bug/?i=7869 + [63] = https://curl.se/bug/?i=7868 + [64] = https://curl.se/bug/?i=7863 + [65] = https://curl.se/bug/?i=7862 + [66] = https://curl.se/bug/?i=7860 + [67] = https://github.com/curl/curl/commit/8a16e54#r57374914 + [68] = https://curl.se/bug/?i=7844 + [69] = https://curl.se/bug/?i=7892 + [70] = https://curl.se/bug/?i=7891 + [71] = https://curl.se/bug/?i=7889 + [72] = https://curl.se/bug/?i=7889 + [73] = https://curl.se/bug/?i=7889 + [74] = https://curl.se/bug/?i=7889 + [75] = https://curl.se/bug/?i=7917 + [76] = https://curl.se/bug/?i=7889 + [77] = https://curl.se/bug/?i=7890 + [78] = https://curl.se/bug/?i=7888 + [79] = https://curl.se/bug/?i=7887 + [80] = https://curl.se/bug/?i=7916 + [81] = https://github.com/curl/curl/issues/7626 + [82] = https://curl.se/bug/?i=7884 + [83] = https://curl.se/bug/?i=7912 + [84] = https://curl.se/bug/?i=7927 + [85] = https://curl.se/bug/?i=7879 + [86] = https://curl.se/bug/?i=7911 + [87] = https://curl.se/bug/?i=7911 + [88] = https://curl.se/bug/?i=7941 + [89] = https://curl.se/bug/?i=7877 + [90] = https://curl.se/bug/?i=7939 + [91] = https://curl.se/bug/?i=7968 + [92] = https://curl.se/bug/?i=7909 + [93] = https://curl.se/bug/?i=7910 + [94] = https://curl.se/bug/?i=7908 + [95] = https://curl.se/bug/?i=7898 + [96] = https://curl.se/bug/?i=7905 + [97] = https://curl.se/bug/?i=7905 + [98] = https://curl.se/bug/?i=7905 + [99] = https://curl.se/bug/?i=7905 + [100] = https://curl.se/bug/?i=7895 + [101] = https://curl.se/bug/?i=7904 + [102] = https://curl.se/bug/?i=7842 + [103] = https://curl.se/bug/?i=7501 + [104] = https://curl.se/bug/?i=7924 + [105] = https://curl.se/bug/?i=7902 + [106] = https://curl.se/bug/?i=7901 + [107] = https://curl.se/bug/?i=7936 + [108] = https://curl.se/bug/?i=7929 + [109] = https://curl.se/bug/?i=7979 + [110] = https://curl.se/bug/?i=7933 + [111] = https://curl.se/bug/?i=7925 + [112] = https://curl.se/bug/?i=7926 + [113] = https://curl.se/bug/?i=7967 + [114] = https://curl.se/bug/?i=7923 + [115] = https://curl.se/bug/?i=6973 + [117] = https://curl.se/bug/?i=7978 + [119] = https://curl.se/bug/?i=7970 + [122] = https://curl.se/bug/?i=7960 + [124] = https://curl.se/bug/?i=7945 + [125] = https://curl.se/bug/?i=7955 + [126] = https://curl.se/bug/?i=7957 diff --git a/3rdparty/curl-7.84.0/acinclude.m4 b/3rdparty/curl-7.80.0/acinclude.m4 similarity index 99% rename from 3rdparty/curl-7.84.0/acinclude.m4 rename to 3rdparty/curl-7.80.0/acinclude.m4 index 313f4c69..feb9e818 100644 --- a/3rdparty/curl-7.84.0/acinclude.m4 +++ b/3rdparty/curl-7.80.0/acinclude.m4 @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2021, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,8 +18,6 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # -# SPDX-License-Identifier: curl -# #*************************************************************************** dnl CURL_CHECK_DEF (SYMBOL, [INCLUDES], [SILENT]) diff --git a/3rdparty/curl-7.84.0/aclocal.m4 b/3rdparty/curl-7.80.0/aclocal.m4 similarity index 99% rename from 3rdparty/curl-7.84.0/aclocal.m4 rename to 3rdparty/curl-7.80.0/aclocal.m4 index 881fdf7f..09539ed1 100644 --- a/3rdparty/curl-7.84.0/aclocal.m4 +++ b/3rdparty/curl-7.80.0/aclocal.m4 @@ -1192,6 +1192,7 @@ m4_include([m4/curl-confopts.m4]) m4_include([m4/curl-functions.m4]) m4_include([m4/curl-gnutls.m4]) m4_include([m4/curl-mbedtls.m4]) +m4_include([m4/curl-mesalink.m4]) m4_include([m4/curl-nss.m4]) m4_include([m4/curl-openssl.m4]) m4_include([m4/curl-override.m4]) diff --git a/3rdparty/curl-7.84.0/buildconf b/3rdparty/curl-7.80.0/buildconf similarity index 53% rename from 3rdparty/curl-7.84.0/buildconf rename to 3rdparty/curl-7.80.0/buildconf index 16fc8a75..4e4c17e9 100644 --- a/3rdparty/curl-7.84.0/buildconf +++ b/3rdparty/curl-7.80.0/buildconf @@ -1,8 +1,4 @@ #!/bin/sh -# -# Copyright (C) 2000 - 2022 Daniel Stenberg, , et al. -# -# SPDX-License-Identifier: curl echo "*** Do not use buildconf. Instead, just use: autoreconf -fi" >&2 exec ${AUTORECONF:-autoreconf} -fi "${@}" diff --git a/3rdparty/curl-7.84.0/buildconf.bat b/3rdparty/curl-7.80.0/buildconf.bat similarity index 98% rename from 3rdparty/curl-7.84.0/buildconf.bat rename to 3rdparty/curl-7.80.0/buildconf.bat index d779795d..13ae07e1 100644 --- a/3rdparty/curl-7.84.0/buildconf.bat +++ b/3rdparty/curl-7.80.0/buildconf.bat @@ -6,7 +6,7 @@ rem * / __| | | | |_) | | rem * | (__| |_| | _ <| |___ rem * \___|\___/|_| \_\_____| rem * -rem * Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +rem * Copyright (C) 1998 - 2019, Daniel Stenberg, , et al. rem * rem * This software is licensed as described in the file COPYING, which rem * you should have received as part of this distribution. The terms @@ -19,8 +19,6 @@ rem * rem * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY rem * KIND, either express or implied. rem * -rem * SPDX-License-Identifier: curl -rem * rem *************************************************************************** rem NOTES diff --git a/3rdparty/curl-7.84.0/compile b/3rdparty/curl-7.80.0/compile similarity index 100% rename from 3rdparty/curl-7.84.0/compile rename to 3rdparty/curl-7.80.0/compile diff --git a/3rdparty/curl-7.84.0/config.guess b/3rdparty/curl-7.80.0/config.guess similarity index 54% rename from 3rdparty/curl-7.84.0/config.guess rename to 3rdparty/curl-7.80.0/config.guess index 7f76b622..f50dcdb6 100644 --- a/3rdparty/curl-7.84.0/config.guess +++ b/3rdparty/curl-7.80.0/config.guess @@ -1,14 +1,12 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2022 Free Software Foundation, Inc. +# Copyright 1992-2018 Free Software Foundation, Inc. -# shellcheck disable=SC2006,SC2268 # see below for rationale - -timestamp='2022-01-09' +timestamp='2018-02-24' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -29,19 +27,11 @@ timestamp='2022-01-09' # Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: -# https://git.savannah.gnu.org/cgit/config.git/plain/config.guess +# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess # # Please send patches to . -# The "shellcheck disable" line above the timestamp inhibits complaints -# about features and limitations of the classic Bourne shell that were -# superseded or lifted in POSIX. However, this script identifies a wide -# variety of pre-POSIX systems that do not have POSIX shells at all, and -# even some reasonably current systems (Solaris 10 as case-in-point) still -# have a pre-POSIX /bin/sh. - - me=`echo "$0" | sed -e 's,.*/,,'` usage="\ @@ -60,7 +50,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2022 Free Software Foundation, Inc. +Copyright 1992-2018 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -94,8 +84,7 @@ if test $# != 0; then exit 1 fi -# Just in case it came from the environment. -GUESS= +trap 'exit 1' 1 2 15 # CC_FOR_BUILD -- compiler used by this script. Note that the use of a # compiler to aid in system detection is discouraged as it requires @@ -107,90 +96,73 @@ GUESS= # Portable tmp directory creation inspired by the Autoconf team. -tmp= -# shellcheck disable=SC2172 -trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15 - -set_cc_for_build() { - # prevent multiple calls if $tmp is already set - test "$tmp" && return 0 - : "${TMPDIR=/tmp}" - # shellcheck disable=SC2039,SC3028 - { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } || - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } || - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } - dummy=$tmp/dummy - case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in - ,,) echo "int x;" > "$dummy.c" - for driver in cc gcc c89 c99 ; do - if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then - CC_FOR_BUILD=$driver - break - fi - done - if test x"$CC_FOR_BUILD" = x ; then - CC_FOR_BUILD=no_compiler_found - fi - ;; - ,,*) CC_FOR_BUILD=$CC ;; - ,*,*) CC_FOR_BUILD=$HOST_CC ;; - esac -} +set_cc_for_build=' +trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; +: ${TMPDIR=/tmp} ; + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; +dummy=$tmp/dummy ; +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; +case $CC_FOR_BUILD,$HOST_CC,$CC in + ,,) echo "int x;" > "$dummy.c" ; + for c in cc gcc c89 c99 ; do + if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then + CC_FOR_BUILD="$c"; break ; + fi ; + done ; + if test x"$CC_FOR_BUILD" = x ; then + CC_FOR_BUILD=no_compiler_found ; + fi + ;; + ,,*) CC_FOR_BUILD=$CC ;; + ,*,*) CC_FOR_BUILD=$HOST_CC ;; +esac ; set_cc_for_build= ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) -if test -f /.attbin/uname ; then +if (test -f /.attbin/uname) >/dev/null 2>&1 ; then PATH=$PATH:/.attbin ; export PATH fi UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown +UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown -case $UNAME_SYSTEM in +case "$UNAME_SYSTEM" in Linux|GNU|GNU/*) - LIBC=unknown + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + LIBC=gnu - set_cc_for_build + eval "$set_cc_for_build" cat <<-EOF > "$dummy.c" #include #if defined(__UCLIBC__) LIBC=uclibc #elif defined(__dietlibc__) LIBC=dietlibc - #elif defined(__GLIBC__) - LIBC=gnu #else - #include - /* First heuristic to detect musl libc. */ - #ifdef __DEFINED_va_list - LIBC=musl - #endif + LIBC=gnu #endif EOF - cc_set_libc=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` - eval "$cc_set_libc" + eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`" - # Second heuristic to detect musl libc. - if [ "$LIBC" = unknown ] && - command -v ldd >/dev/null && - ldd --version 2>&1 | grep -q ^musl; then - LIBC=musl - fi - - # If the system lacks a compiler, then just pick glibc. - # We could probably try harder. - if [ "$LIBC" = unknown ]; then - LIBC=gnu + # If ldd exists, use it to detect musl libc. + if command -v ldd >/dev/null && \ + ldd --version 2>&1 | grep -q ^musl + then + LIBC=musl fi ;; esac # Note: order is significant - the case branches are not exclusive. -case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in +case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, @@ -202,12 +174,12 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in # # Note: NetBSD doesn't particularly care about the vendor # portion of the name. We always set it to "unknown". + sysctl="sysctl -n hw.machine_arch" UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ - /sbin/sysctl -n hw.machine_arch 2>/dev/null || \ - /usr/sbin/sysctl -n hw.machine_arch 2>/dev/null || \ + "/sbin/$sysctl" 2>/dev/null || \ + "/usr/sbin/$sysctl" 2>/dev/null || \ echo unknown)` - case $UNAME_MACHINE_ARCH in - aarch64eb) machine=aarch64_be-unknown ;; + case "$UNAME_MACHINE_ARCH" in armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; @@ -216,18 +188,18 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in earmv*) arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'` endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'` - machine=${arch}${endian}-unknown + machine="${arch}${endian}"-unknown ;; - *) machine=$UNAME_MACHINE_ARCH-unknown ;; + *) machine="$UNAME_MACHINE_ARCH"-unknown ;; esac # The Operating System including object format, if it has switched # to ELF recently (or will in the future) and ABI. - case $UNAME_MACHINE_ARCH in + case "$UNAME_MACHINE_ARCH" in earm*) os=netbsdelf ;; arm*|i386|m68k|ns32k|sh3*|sparc|vax) - set_cc_for_build + eval "$set_cc_for_build" if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ELF__ then @@ -243,7 +215,7 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in ;; esac # Determine ABI tags. - case $UNAME_MACHINE_ARCH in + case "$UNAME_MACHINE_ARCH" in earm*) expr='s/^earmv[0-9]/-eabi/;s/eb$//' abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"` @@ -254,7 +226,7 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in # thus, need a distinct triplet. However, they do not need # kernel version information, so it can be replaced with a # suitable tag, in the style of linux-gnu. - case $UNAME_VERSION in + case "$UNAME_VERSION" in Debian*) release='-gnu' ;; @@ -265,57 +237,45 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - GUESS=$machine-${os}${release}${abi-} - ;; + echo "$machine-${os}${release}${abi}" + exit ;; *:Bitrig:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` - GUESS=$UNAME_MACHINE_ARCH-unknown-bitrig$UNAME_RELEASE - ;; + echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE" + exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - GUESS=$UNAME_MACHINE_ARCH-unknown-openbsd$UNAME_RELEASE - ;; - *:SecBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/SecBSD.//'` - GUESS=$UNAME_MACHINE_ARCH-unknown-secbsd$UNAME_RELEASE - ;; + echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE" + exit ;; *:LibertyBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` - GUESS=$UNAME_MACHINE_ARCH-unknown-libertybsd$UNAME_RELEASE - ;; + echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE" + exit ;; *:MidnightBSD:*:*) - GUESS=$UNAME_MACHINE-unknown-midnightbsd$UNAME_RELEASE - ;; + echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE" + exit ;; *:ekkoBSD:*:*) - GUESS=$UNAME_MACHINE-unknown-ekkobsd$UNAME_RELEASE - ;; + echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE" + exit ;; *:SolidBSD:*:*) - GUESS=$UNAME_MACHINE-unknown-solidbsd$UNAME_RELEASE - ;; - *:OS108:*:*) - GUESS=$UNAME_MACHINE-unknown-os108_$UNAME_RELEASE - ;; + echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE" + exit ;; macppc:MirBSD:*:*) - GUESS=powerpc-unknown-mirbsd$UNAME_RELEASE - ;; + echo powerpc-unknown-mirbsd"$UNAME_RELEASE" + exit ;; *:MirBSD:*:*) - GUESS=$UNAME_MACHINE-unknown-mirbsd$UNAME_RELEASE - ;; + echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE" + exit ;; *:Sortix:*:*) - GUESS=$UNAME_MACHINE-unknown-sortix - ;; - *:Twizzler:*:*) - GUESS=$UNAME_MACHINE-unknown-twizzler - ;; + echo "$UNAME_MACHINE"-unknown-sortix + exit ;; *:Redox:*:*) - GUESS=$UNAME_MACHINE-unknown-redox - ;; + echo "$UNAME_MACHINE"-unknown-redox + exit ;; mips:OSF1:*.*) - GUESS=mips-dec-osf1 - ;; + echo mips-dec-osf1 + exit ;; alpha:OSF1:*:*) - # Reset EXIT trap before exiting to avoid spurious non-zero exit code. - trap '' 0 case $UNAME_RELEASE in *4.0) UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` @@ -329,7 +289,7 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in # covers most systems running today. This code pipes the CPU # types through head -n 1, so we only detect the type of CPU 0. ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` - case $ALPHA_CPU_TYPE in + case "$ALPHA_CPU_TYPE" in "EV4 (21064)") UNAME_MACHINE=alpha ;; "EV4.5 (21064)") @@ -366,121 +326,117 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - OSF_REL=`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` - GUESS=$UNAME_MACHINE-dec-osf$OSF_REL - ;; + echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`" + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 + exit $exitcode ;; Amiga*:UNIX_System_V:4.0:*) - GUESS=m68k-unknown-sysv4 - ;; + echo m68k-unknown-sysv4 + exit ;; *:[Aa]miga[Oo][Ss]:*:*) - GUESS=$UNAME_MACHINE-unknown-amigaos - ;; + echo "$UNAME_MACHINE"-unknown-amigaos + exit ;; *:[Mm]orph[Oo][Ss]:*:*) - GUESS=$UNAME_MACHINE-unknown-morphos - ;; + echo "$UNAME_MACHINE"-unknown-morphos + exit ;; *:OS/390:*:*) - GUESS=i370-ibm-openedition - ;; + echo i370-ibm-openedition + exit ;; *:z/VM:*:*) - GUESS=s390-ibm-zvmoe - ;; + echo s390-ibm-zvmoe + exit ;; *:OS400:*:*) - GUESS=powerpc-ibm-os400 - ;; + echo powerpc-ibm-os400 + exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - GUESS=arm-acorn-riscix$UNAME_RELEASE - ;; + echo arm-acorn-riscix"$UNAME_RELEASE" + exit ;; arm*:riscos:*:*|arm*:RISCOS:*:*) - GUESS=arm-unknown-riscos - ;; + echo arm-unknown-riscos + exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) - GUESS=hppa1.1-hitachi-hiuxmpp - ;; + echo hppa1.1-hitachi-hiuxmpp + exit ;; Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. - case `(/bin/universe) 2>/dev/null` in - att) GUESS=pyramid-pyramid-sysv3 ;; - *) GUESS=pyramid-pyramid-bsd ;; - esac - ;; + if test "`(/bin/universe) 2>/dev/null`" = att ; then + echo pyramid-pyramid-sysv3 + else + echo pyramid-pyramid-bsd + fi + exit ;; NILE*:*:*:dcosx) - GUESS=pyramid-pyramid-svr4 - ;; + echo pyramid-pyramid-svr4 + exit ;; DRS?6000:unix:4.0:6*) - GUESS=sparc-icl-nx6 - ;; + echo sparc-icl-nx6 + exit ;; DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) case `/usr/bin/uname -p` in - sparc) GUESS=sparc-icl-nx7 ;; - esac - ;; + sparc) echo sparc-icl-nx7; exit ;; + esac ;; s390x:SunOS:*:*) - SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` - GUESS=$UNAME_MACHINE-ibm-solaris2$SUN_REL - ;; + echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" + exit ;; sun4H:SunOS:5.*:*) - SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` - GUESS=sparc-hal-solaris2$SUN_REL - ;; + echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" + exit ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` - GUESS=sparc-sun-solaris2$SUN_REL - ;; + echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" + exit ;; i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) - GUESS=i386-pc-auroraux$UNAME_RELEASE - ;; + echo i386-pc-auroraux"$UNAME_RELEASE" + exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - set_cc_for_build + eval "$set_cc_for_build" SUN_ARCH=i386 # If there is a compiler, see if it is configured for 64-bit objects. # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. # This test works for both compilers. - if test "$CC_FOR_BUILD" != no_compiler_found; then + if [ "$CC_FOR_BUILD" != no_compiler_found ]; then if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -m64 -E - 2>/dev/null) | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null then SUN_ARCH=x86_64 fi fi - SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` - GUESS=$SUN_ARCH-pc-solaris2$SUN_REL - ;; + echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" + exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. - SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` - GUESS=sparc-sun-solaris3$SUN_REL - ;; + echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" + exit ;; sun4*:SunOS:*:*) - case `/usr/bin/arch -k` in + case "`/usr/bin/arch -k`" in Series*|S4*) UNAME_RELEASE=`uname -v` ;; esac # Japanese Language versions have a version number like `4.1.3-JL'. - SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/'` - GUESS=sparc-sun-sunos$SUN_REL - ;; + echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`" + exit ;; sun3*:SunOS:*:*) - GUESS=m68k-sun-sunos$UNAME_RELEASE - ;; + echo m68k-sun-sunos"$UNAME_RELEASE" + exit ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3 - case `/bin/arch` in + case "`/bin/arch`" in sun3) - GUESS=m68k-sun-sunos$UNAME_RELEASE + echo m68k-sun-sunos"$UNAME_RELEASE" ;; sun4) - GUESS=sparc-sun-sunos$UNAME_RELEASE + echo sparc-sun-sunos"$UNAME_RELEASE" ;; esac - ;; + exit ;; aushp:SunOS:*:*) - GUESS=sparc-auspex-sunos$UNAME_RELEASE - ;; + echo sparc-auspex-sunos"$UNAME_RELEASE" + exit ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not # "atarist" or "atariste" at least should have a processor @@ -490,43 +446,43 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - GUESS=m68k-atari-mint$UNAME_RELEASE - ;; + echo m68k-atari-mint"$UNAME_RELEASE" + exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - GUESS=m68k-atari-mint$UNAME_RELEASE - ;; + echo m68k-atari-mint"$UNAME_RELEASE" + exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - GUESS=m68k-atari-mint$UNAME_RELEASE - ;; + echo m68k-atari-mint"$UNAME_RELEASE" + exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - GUESS=m68k-milan-mint$UNAME_RELEASE - ;; + echo m68k-milan-mint"$UNAME_RELEASE" + exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - GUESS=m68k-hades-mint$UNAME_RELEASE - ;; + echo m68k-hades-mint"$UNAME_RELEASE" + exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - GUESS=m68k-unknown-mint$UNAME_RELEASE - ;; + echo m68k-unknown-mint"$UNAME_RELEASE" + exit ;; m68k:machten:*:*) - GUESS=m68k-apple-machten$UNAME_RELEASE - ;; + echo m68k-apple-machten"$UNAME_RELEASE" + exit ;; powerpc:machten:*:*) - GUESS=powerpc-apple-machten$UNAME_RELEASE - ;; + echo powerpc-apple-machten"$UNAME_RELEASE" + exit ;; RISC*:Mach:*:*) - GUESS=mips-dec-mach_bsd4.3 - ;; + echo mips-dec-mach_bsd4.3 + exit ;; RISC*:ULTRIX:*:*) - GUESS=mips-dec-ultrix$UNAME_RELEASE - ;; + echo mips-dec-ultrix"$UNAME_RELEASE" + exit ;; VAX*:ULTRIX*:*:*) - GUESS=vax-dec-ultrix$UNAME_RELEASE - ;; + echo vax-dec-ultrix"$UNAME_RELEASE" + exit ;; 2020:CLIX:*:* | 2430:CLIX:*:*) - GUESS=clipper-intergraph-clix$UNAME_RELEASE - ;; + echo clipper-intergraph-clix"$UNAME_RELEASE" + exit ;; mips:*:*:UMIPS | mips:*:*:RISCos) - set_cc_for_build + eval "$set_cc_for_build" sed 's/^ //' << EOF > "$dummy.c" #ifdef __cplusplus #include /* for printf() prototype */ @@ -552,79 +508,78 @@ EOF dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` && SYSTEM_NAME=`"$dummy" "$dummyarg"` && { echo "$SYSTEM_NAME"; exit; } - GUESS=mips-mips-riscos$UNAME_RELEASE - ;; + echo mips-mips-riscos"$UNAME_RELEASE" + exit ;; Motorola:PowerMAX_OS:*:*) - GUESS=powerpc-motorola-powermax - ;; + echo powerpc-motorola-powermax + exit ;; Motorola:*:4.3:PL8-*) - GUESS=powerpc-harris-powermax - ;; + echo powerpc-harris-powermax + exit ;; Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) - GUESS=powerpc-harris-powermax - ;; + echo powerpc-harris-powermax + exit ;; Night_Hawk:Power_UNIX:*:*) - GUESS=powerpc-harris-powerunix - ;; + echo powerpc-harris-powerunix + exit ;; m88k:CX/UX:7*:*) - GUESS=m88k-harris-cxux7 - ;; + echo m88k-harris-cxux7 + exit ;; m88k:*:4*:R4*) - GUESS=m88k-motorola-sysv4 - ;; + echo m88k-motorola-sysv4 + exit ;; m88k:*:3*:R3*) - GUESS=m88k-motorola-sysv3 - ;; + echo m88k-motorola-sysv3 + exit ;; AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` - if test "$UNAME_PROCESSOR" = mc88100 || test "$UNAME_PROCESSOR" = mc88110 + if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ] then - if test "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx || \ - test "$TARGET_BINARY_INTERFACE"x = x + if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \ + [ "$TARGET_BINARY_INTERFACE"x = x ] then - GUESS=m88k-dg-dgux$UNAME_RELEASE + echo m88k-dg-dgux"$UNAME_RELEASE" else - GUESS=m88k-dg-dguxbcs$UNAME_RELEASE + echo m88k-dg-dguxbcs"$UNAME_RELEASE" fi else - GUESS=i586-dg-dgux$UNAME_RELEASE + echo i586-dg-dgux"$UNAME_RELEASE" fi - ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) - GUESS=m88k-dolphin-sysv3 - ;; + echo m88k-dolphin-sysv3 + exit ;; M88*:*:R3*:*) # Delta 88k system running SVR3 - GUESS=m88k-motorola-sysv3 - ;; + echo m88k-motorola-sysv3 + exit ;; XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) - GUESS=m88k-tektronix-sysv3 - ;; + echo m88k-tektronix-sysv3 + exit ;; Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) - GUESS=m68k-tektronix-bsd - ;; + echo m68k-tektronix-bsd + exit ;; *:IRIX*:*:*) - IRIX_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/g'` - GUESS=mips-sgi-irix$IRIX_REL - ;; + echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`" + exit ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - GUESS=romp-ibm-aix # uname -m gives an 8 hex-code CPU id - ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id + exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' i*86:AIX:*:*) - GUESS=i386-ibm-aix - ;; + echo i386-ibm-aix + exit ;; ia64:AIX:*:*) - if test -x /usr/bin/oslevel ; then + if [ -x /usr/bin/oslevel ] ; then IBM_REV=`/usr/bin/oslevel` else - IBM_REV=$UNAME_VERSION.$UNAME_RELEASE + IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" fi - GUESS=$UNAME_MACHINE-ibm-aix$IBM_REV - ;; + echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV" + exit ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - set_cc_for_build + eval "$set_cc_for_build" sed 's/^ //' << EOF > "$dummy.c" #include @@ -638,16 +593,16 @@ EOF EOF if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` then - GUESS=$SYSTEM_NAME + echo "$SYSTEM_NAME" else - GUESS=rs6000-ibm-aix3.2.5 + echo rs6000-ibm-aix3.2.5 fi elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then - GUESS=rs6000-ibm-aix3.2.4 + echo rs6000-ibm-aix3.2.4 else - GUESS=rs6000-ibm-aix3.2 + echo rs6000-ibm-aix3.2 fi - ;; + exit ;; *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then @@ -655,57 +610,57 @@ EOF else IBM_ARCH=powerpc fi - if test -x /usr/bin/lslpp ; then - IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | \ + if [ -x /usr/bin/lslpp ] ; then + IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` else - IBM_REV=$UNAME_VERSION.$UNAME_RELEASE + IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" fi - GUESS=$IBM_ARCH-ibm-aix$IBM_REV - ;; + echo "$IBM_ARCH"-ibm-aix"$IBM_REV" + exit ;; *:AIX:*:*) - GUESS=rs6000-ibm-aix - ;; + echo rs6000-ibm-aix + exit ;; ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*) - GUESS=romp-ibm-bsd4.4 - ;; + echo romp-ibm-bsd4.4 + exit ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - GUESS=romp-ibm-bsd$UNAME_RELEASE # 4.3 with uname added to - ;; # report: romp-ibm BSD 4.3 + echo romp-ibm-bsd"$UNAME_RELEASE" # 4.3 with uname added to + exit ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) - GUESS=rs6000-bull-bosx - ;; + echo rs6000-bull-bosx + exit ;; DPX/2?00:B.O.S.:*:*) - GUESS=m68k-bull-sysv3 - ;; + echo m68k-bull-sysv3 + exit ;; 9000/[34]??:4.3bsd:1.*:*) - GUESS=m68k-hp-bsd - ;; + echo m68k-hp-bsd + exit ;; hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) - GUESS=m68k-hp-bsd4.4 - ;; + echo m68k-hp-bsd4.4 + exit ;; 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*.[0B]*//'` - case $UNAME_MACHINE in + HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` + case "$UNAME_MACHINE" in 9000/31?) HP_ARCH=m68000 ;; 9000/[34]??) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) - if test -x /usr/bin/getconf; then + if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case $sc_cpu_version in + case "$sc_cpu_version" in 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 532) # CPU_PA_RISC2_0 - case $sc_kernel_bits in + case "$sc_kernel_bits" in 32) HP_ARCH=hppa2.0n ;; 64) HP_ARCH=hppa2.0w ;; '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 esac ;; esac fi - if test "$HP_ARCH" = ""; then - set_cc_for_build + if [ "$HP_ARCH" = "" ]; then + eval "$set_cc_for_build" sed 's/^ //' << EOF > "$dummy.c" #define _HPUX_SOURCE @@ -743,9 +698,9 @@ EOF test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac - if test "$HP_ARCH" = hppa2.0w + if [ "$HP_ARCH" = hppa2.0w ] then - set_cc_for_build + eval "$set_cc_for_build" # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler @@ -764,14 +719,14 @@ EOF HP_ARCH=hppa64 fi fi - GUESS=$HP_ARCH-hp-hpux$HPUX_REV - ;; + echo "$HP_ARCH"-hp-hpux"$HPUX_REV" + exit ;; ia64:HP-UX:*:*) - HPUX_REV=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*.[0B]*//'` - GUESS=ia64-hp-hpux$HPUX_REV - ;; + HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` + echo ia64-hp-hpux"$HPUX_REV" + exit ;; 3050*:HI-UX:*:*) - set_cc_for_build + eval "$set_cc_for_build" sed 's/^ //' << EOF > "$dummy.c" #include int @@ -799,36 +754,36 @@ EOF EOF $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` && { echo "$SYSTEM_NAME"; exit; } - GUESS=unknown-hitachi-hiuxwe2 - ;; + echo unknown-hitachi-hiuxwe2 + exit ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*) - GUESS=hppa1.1-hp-bsd - ;; + echo hppa1.1-hp-bsd + exit ;; 9000/8??:4.3bsd:*:*) - GUESS=hppa1.0-hp-bsd - ;; + echo hppa1.0-hp-bsd + exit ;; *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) - GUESS=hppa1.0-hp-mpeix - ;; + echo hppa1.0-hp-mpeix + exit ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*) - GUESS=hppa1.1-hp-osf - ;; + echo hppa1.1-hp-osf + exit ;; hp8??:OSF1:*:*) - GUESS=hppa1.0-hp-osf - ;; + echo hppa1.0-hp-osf + exit ;; i*86:OSF1:*:*) - if test -x /usr/sbin/sysversion ; then - GUESS=$UNAME_MACHINE-unknown-osf1mk + if [ -x /usr/sbin/sysversion ] ; then + echo "$UNAME_MACHINE"-unknown-osf1mk else - GUESS=$UNAME_MACHINE-unknown-osf1 + echo "$UNAME_MACHINE"-unknown-osf1 fi - ;; + exit ;; parisc*:Lites*:*:*) - GUESS=hppa1.1-hp-lites - ;; + echo hppa1.1-hp-lites + exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - GUESS=c1-convex-bsd - ;; + echo c1-convex-bsd + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd @@ -836,18 +791,17 @@ EOF fi exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - GUESS=c34-convex-bsd - ;; + echo c34-convex-bsd + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - GUESS=c38-convex-bsd - ;; + echo c38-convex-bsd + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - GUESS=c4-convex-bsd - ;; + echo c4-convex-bsd + exit ;; CRAY*Y-MP:*:*:*) - CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` - GUESS=ymp-cray-unicos$CRAY_REL - ;; + echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' + exit ;; CRAY*[A-Z]90:*:*:*) echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ @@ -855,129 +809,103 @@ EOF -e 's/\.[^.]*$/.X/' exit ;; CRAY*TS:*:*:*) - CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` - GUESS=t90-cray-unicos$CRAY_REL - ;; + echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' + exit ;; CRAY*T3E:*:*:*) - CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` - GUESS=alphaev5-cray-unicosmk$CRAY_REL - ;; + echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' + exit ;; CRAY*SV1:*:*:*) - CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` - GUESS=sv1-cray-unicos$CRAY_REL - ;; + echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' + exit ;; *:UNICOS/mp:*:*) - CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` - GUESS=craynv-cray-unicosmp$CRAY_REL - ;; + echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' + exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'` - GUESS=${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL} - ;; + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; 5000:UNIX_System_V:4.*:*) FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` - GUESS=sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL} - ;; + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - GUESS=$UNAME_MACHINE-pc-bsdi$UNAME_RELEASE - ;; + echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE" + exit ;; sparc*:BSD/OS:*:*) - GUESS=sparc-unknown-bsdi$UNAME_RELEASE - ;; + echo sparc-unknown-bsdi"$UNAME_RELEASE" + exit ;; *:BSD/OS:*:*) - GUESS=$UNAME_MACHINE-unknown-bsdi$UNAME_RELEASE - ;; - arm:FreeBSD:*:*) - UNAME_PROCESSOR=`uname -p` - set_cc_for_build - if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep -q __ARM_PCS_VFP - then - FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` - GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabi - else - FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` - GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabihf - fi - ;; + echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE" + exit ;; *:FreeBSD:*:*) UNAME_PROCESSOR=`/usr/bin/uname -p` - case $UNAME_PROCESSOR in + case "$UNAME_PROCESSOR" in amd64) UNAME_PROCESSOR=x86_64 ;; i386) UNAME_PROCESSOR=i586 ;; esac - FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` - GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL - ;; + echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" + exit ;; i*:CYGWIN*:*) - GUESS=$UNAME_MACHINE-pc-cygwin - ;; + echo "$UNAME_MACHINE"-pc-cygwin + exit ;; *:MINGW64*:*) - GUESS=$UNAME_MACHINE-pc-mingw64 - ;; + echo "$UNAME_MACHINE"-pc-mingw64 + exit ;; *:MINGW*:*) - GUESS=$UNAME_MACHINE-pc-mingw32 - ;; + echo "$UNAME_MACHINE"-pc-mingw32 + exit ;; *:MSYS*:*) - GUESS=$UNAME_MACHINE-pc-msys - ;; + echo "$UNAME_MACHINE"-pc-msys + exit ;; i*:PW*:*) - GUESS=$UNAME_MACHINE-pc-pw32 - ;; - *:SerenityOS:*:*) - GUESS=$UNAME_MACHINE-pc-serenity - ;; + echo "$UNAME_MACHINE"-pc-pw32 + exit ;; *:Interix*:*) - case $UNAME_MACHINE in + case "$UNAME_MACHINE" in x86) - GUESS=i586-pc-interix$UNAME_RELEASE - ;; + echo i586-pc-interix"$UNAME_RELEASE" + exit ;; authenticamd | genuineintel | EM64T) - GUESS=x86_64-unknown-interix$UNAME_RELEASE - ;; + echo x86_64-unknown-interix"$UNAME_RELEASE" + exit ;; IA64) - GUESS=ia64-unknown-interix$UNAME_RELEASE - ;; + echo ia64-unknown-interix"$UNAME_RELEASE" + exit ;; esac ;; i*:UWIN*:*) - GUESS=$UNAME_MACHINE-pc-uwin - ;; + echo "$UNAME_MACHINE"-pc-uwin + exit ;; amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) - GUESS=x86_64-pc-cygwin - ;; + echo x86_64-unknown-cygwin + exit ;; prep*:SunOS:5.*:*) - SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` - GUESS=powerpcle-unknown-solaris2$SUN_REL - ;; + echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" + exit ;; *:GNU:*:*) # the GNU system - GNU_ARCH=`echo "$UNAME_MACHINE" | sed -e 's,[-/].*$,,'` - GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's,/.*$,,'` - GUESS=$GNU_ARCH-unknown-$LIBC$GNU_REL - ;; + echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`" + exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - GNU_SYS=`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"` - GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` - GUESS=$UNAME_MACHINE-unknown-$GNU_SYS$GNU_REL-$LIBC - ;; - *:Minix:*:*) - GUESS=$UNAME_MACHINE-unknown-minix - ;; + echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC" + exit ;; + i*86:Minix:*:*) + echo "$UNAME_MACHINE"-pc-minix + exit ;; aarch64:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null` in + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; EV56) UNAME_MACHINE=alphaev56 ;; PCA56) UNAME_MACHINE=alphapca56 ;; @@ -988,225 +916,187 @@ EOF esac objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC=gnulibc1 ; fi - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; - arc:Linux:*:* | arceb:Linux:*:* | arc32:Linux:*:* | arc64:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; + arc:Linux:*:* | arceb:Linux:*:*) + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; arm*:Linux:*:*) - set_cc_for_build + eval "$set_cc_for_build" if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabi + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi else - GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabihf + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf fi fi - ;; + exit ;; avr32*:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; cris:Linux:*:*) - GUESS=$UNAME_MACHINE-axis-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-axis-linux-"$LIBC" + exit ;; crisv32:Linux:*:*) - GUESS=$UNAME_MACHINE-axis-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-axis-linux-"$LIBC" + exit ;; e2k:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; frv:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; hexagon:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; i*86:Linux:*:*) - GUESS=$UNAME_MACHINE-pc-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-pc-linux-"$LIBC" + exit ;; ia64:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; k1om:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; - loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; m32r*:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; m68*:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; mips:Linux:*:* | mips64:Linux:*:*) - set_cc_for_build - IS_GLIBC=0 - test x"${LIBC}" = xgnu && IS_GLIBC=1 + eval "$set_cc_for_build" sed 's/^ //' << EOF > "$dummy.c" #undef CPU - #undef mips - #undef mipsel - #undef mips64 - #undef mips64el - #if ${IS_GLIBC} && defined(_ABI64) - LIBCABI=gnuabi64 - #else - #if ${IS_GLIBC} && defined(_ABIN32) - LIBCABI=gnuabin32 - #else - LIBCABI=${LIBC} - #endif - #endif - - #if ${IS_GLIBC} && defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6 - CPU=mipsisa64r6 - #else - #if ${IS_GLIBC} && !defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6 - CPU=mipsisa32r6 - #else - #if defined(__mips64) - CPU=mips64 - #else - CPU=mips - #endif - #endif - #endif - + #undef ${UNAME_MACHINE} + #undef ${UNAME_MACHINE}el #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - MIPS_ENDIAN=el + CPU=${UNAME_MACHINE}el #else #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - MIPS_ENDIAN= + CPU=${UNAME_MACHINE} #else - MIPS_ENDIAN= + CPU= #endif #endif EOF - cc_set_vars=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI'` - eval "$cc_set_vars" - test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; } + eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`" + test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; } ;; mips64el:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; openrisc*:Linux:*:*) - GUESS=or1k-unknown-linux-$LIBC - ;; + echo or1k-unknown-linux-"$LIBC" + exit ;; or32:Linux:*:* | or1k*:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; padre:Linux:*:*) - GUESS=sparc-unknown-linux-$LIBC - ;; + echo sparc-unknown-linux-"$LIBC" + exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - GUESS=hppa64-unknown-linux-$LIBC - ;; + echo hppa64-unknown-linux-"$LIBC" + exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) GUESS=hppa1.1-unknown-linux-$LIBC ;; - PA8*) GUESS=hppa2.0-unknown-linux-$LIBC ;; - *) GUESS=hppa-unknown-linux-$LIBC ;; + PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;; + PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;; + *) echo hppa-unknown-linux-"$LIBC" ;; esac - ;; + exit ;; ppc64:Linux:*:*) - GUESS=powerpc64-unknown-linux-$LIBC - ;; + echo powerpc64-unknown-linux-"$LIBC" + exit ;; ppc:Linux:*:*) - GUESS=powerpc-unknown-linux-$LIBC - ;; + echo powerpc-unknown-linux-"$LIBC" + exit ;; ppc64le:Linux:*:*) - GUESS=powerpc64le-unknown-linux-$LIBC - ;; + echo powerpc64le-unknown-linux-"$LIBC" + exit ;; ppcle:Linux:*:*) - GUESS=powerpcle-unknown-linux-$LIBC - ;; - riscv32:Linux:*:* | riscv32be:Linux:*:* | riscv64:Linux:*:* | riscv64be:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo powerpcle-unknown-linux-"$LIBC" + exit ;; + riscv32:Linux:*:* | riscv64:Linux:*:*) + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; s390:Linux:*:* | s390x:Linux:*:*) - GUESS=$UNAME_MACHINE-ibm-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-ibm-linux-"$LIBC" + exit ;; sh64*:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; sh*:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; tile*:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; vax:Linux:*:*) - GUESS=$UNAME_MACHINE-dec-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-dec-linux-"$LIBC" + exit ;; x86_64:Linux:*:*) - set_cc_for_build - LIBCABI=$LIBC - if test "$CC_FOR_BUILD" != no_compiler_found; then - if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_X32 >/dev/null - then - LIBCABI=${LIBC}x32 - fi + if objdump -f /bin/sh | grep -q elf32-x86-64; then + echo "$UNAME_MACHINE"-pc-linux-"$LIBC"x32 + else + echo "$UNAME_MACHINE"-pc-linux-"$LIBC" fi - GUESS=$UNAME_MACHINE-pc-linux-$LIBCABI - ;; + exit ;; xtensa*:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # earlier versions are messed up and put the nodename in both # sysname and nodename. - GUESS=i386-sequent-sysv4 - ;; + echo i386-sequent-sysv4 + exit ;; i*86:UNIX_SV:4.2MP:2.*) # Unixware is an offshoot of SVR4, but it has its own version # number series starting with 2... # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. # Use sysv4.2uw... so that sysv4* matches it. - GUESS=$UNAME_MACHINE-pc-sysv4.2uw$UNAME_VERSION - ;; + echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION" + exit ;; i*86:OS/2:*:*) # If we were able to find `uname', then EMX Unix compatibility # is probably installed. - GUESS=$UNAME_MACHINE-pc-os2-emx - ;; + echo "$UNAME_MACHINE"-pc-os2-emx + exit ;; i*86:XTS-300:*:STOP) - GUESS=$UNAME_MACHINE-unknown-stop - ;; + echo "$UNAME_MACHINE"-unknown-stop + exit ;; i*86:atheos:*:*) - GUESS=$UNAME_MACHINE-unknown-atheos - ;; + echo "$UNAME_MACHINE"-unknown-atheos + exit ;; i*86:syllable:*:*) - GUESS=$UNAME_MACHINE-pc-syllable - ;; + echo "$UNAME_MACHINE"-pc-syllable + exit ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) - GUESS=i386-unknown-lynxos$UNAME_RELEASE - ;; + echo i386-unknown-lynxos"$UNAME_RELEASE" + exit ;; i*86:*DOS:*:*) - GUESS=$UNAME_MACHINE-pc-msdosdjgpp - ;; + echo "$UNAME_MACHINE"-pc-msdosdjgpp + exit ;; i*86:*:4.*:*) UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - GUESS=$UNAME_MACHINE-univel-sysv$UNAME_REL + echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL" else - GUESS=$UNAME_MACHINE-pc-sysv$UNAME_REL + echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL" fi - ;; + exit ;; i*86:*:5:[678]*) # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in @@ -1214,12 +1104,12 @@ EOF *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac - GUESS=$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} - ;; + echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}" + exit ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 @@ -1229,11 +1119,11 @@ EOF && UNAME_MACHINE=i686 (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ && UNAME_MACHINE=i686 - GUESS=$UNAME_MACHINE-pc-sco$UNAME_REL + echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL" else - GUESS=$UNAME_MACHINE-pc-sysv32 + echo "$UNAME_MACHINE"-pc-sysv32 fi - ;; + exit ;; pc:*:*:*) # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about @@ -1241,31 +1131,31 @@ EOF # Note: whatever this is, it MUST be the same as what config.sub # prints for the "djgpp" host, or else GDB configure will decide that # this is a cross-build. - GUESS=i586-pc-msdosdjgpp - ;; + echo i586-pc-msdosdjgpp + exit ;; Intel:Mach:3*:*) - GUESS=i386-pc-mach3 - ;; + echo i386-pc-mach3 + exit ;; paragon:*:*:*) - GUESS=i860-intel-osf1 - ;; + echo i860-intel-osf1 + exit ;; i860:*:4.*:*) # i860-SVR4 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - GUESS=i860-stardent-sysv$UNAME_RELEASE # Stardent Vistra i860-SVR4 + echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. - GUESS=i860-unknown-sysv$UNAME_RELEASE # Unknown i860-SVR4 + echo i860-unknown-sysv"$UNAME_RELEASE" # Unknown i860-SVR4 fi - ;; + exit ;; mini*:CTIX:SYS*5:*) # "miniframe" - GUESS=m68010-convergent-sysv - ;; + echo m68010-convergent-sysv + exit ;; mc68k:UNIX:SYSTEM5:3.51m) - GUESS=m68k-convergent-sysv - ;; + echo m68k-convergent-sysv + exit ;; M680?0:D-NIX:5.3:*) - GUESS=m68k-diab-dnix - ;; + echo m68k-diab-dnix + exit ;; M68*:*:R3V[5678]*:*) test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) @@ -1290,404 +1180,249 @@ EOF /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - GUESS=m68k-unknown-lynxos$UNAME_RELEASE - ;; + echo m68k-unknown-lynxos"$UNAME_RELEASE" + exit ;; mc68030:UNIX_System_V:4.*:*) - GUESS=m68k-atari-sysv4 - ;; + echo m68k-atari-sysv4 + exit ;; TSUNAMI:LynxOS:2.*:*) - GUESS=sparc-unknown-lynxos$UNAME_RELEASE - ;; + echo sparc-unknown-lynxos"$UNAME_RELEASE" + exit ;; rs6000:LynxOS:2.*:*) - GUESS=rs6000-unknown-lynxos$UNAME_RELEASE - ;; + echo rs6000-unknown-lynxos"$UNAME_RELEASE" + exit ;; PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) - GUESS=powerpc-unknown-lynxos$UNAME_RELEASE - ;; + echo powerpc-unknown-lynxos"$UNAME_RELEASE" + exit ;; SM[BE]S:UNIX_SV:*:*) - GUESS=mips-dde-sysv$UNAME_RELEASE - ;; + echo mips-dde-sysv"$UNAME_RELEASE" + exit ;; RM*:ReliantUNIX-*:*:*) - GUESS=mips-sni-sysv4 - ;; + echo mips-sni-sysv4 + exit ;; RM*:SINIX-*:*:*) - GUESS=mips-sni-sysv4 - ;; + echo mips-sni-sysv4 + exit ;; *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` - GUESS=$UNAME_MACHINE-sni-sysv4 + echo "$UNAME_MACHINE"-sni-sysv4 else - GUESS=ns32k-sni-sysv + echo ns32k-sni-sysv fi - ;; + exit ;; PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort # says - GUESS=i586-unisys-sysv4 - ;; + echo i586-unisys-sysv4 + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm - GUESS=hppa1.1-stratus-sysv4 - ;; + echo hppa1.1-stratus-sysv4 + exit ;; *:*:*:FTX*) # From seanf@swdc.stratus.com. - GUESS=i860-stratus-sysv4 - ;; + echo i860-stratus-sysv4 + exit ;; i*86:VOS:*:*) # From Paul.Green@stratus.com. - GUESS=$UNAME_MACHINE-stratus-vos - ;; + echo "$UNAME_MACHINE"-stratus-vos + exit ;; *:VOS:*:*) # From Paul.Green@stratus.com. - GUESS=hppa1.1-stratus-vos - ;; + echo hppa1.1-stratus-vos + exit ;; mc68*:A/UX:*:*) - GUESS=m68k-apple-aux$UNAME_RELEASE - ;; + echo m68k-apple-aux"$UNAME_RELEASE" + exit ;; news*:NEWS-OS:6*:*) - GUESS=mips-sony-newsos6 - ;; + echo mips-sony-newsos6 + exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if test -d /usr/nec; then - GUESS=mips-nec-sysv$UNAME_RELEASE + if [ -d /usr/nec ]; then + echo mips-nec-sysv"$UNAME_RELEASE" else - GUESS=mips-unknown-sysv$UNAME_RELEASE + echo mips-unknown-sysv"$UNAME_RELEASE" fi - ;; + exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - GUESS=powerpc-be-beos - ;; + echo powerpc-be-beos + exit ;; BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. - GUESS=powerpc-apple-beos - ;; + echo powerpc-apple-beos + exit ;; BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - GUESS=i586-pc-beos - ;; + echo i586-pc-beos + exit ;; BePC:Haiku:*:*) # Haiku running on Intel PC compatible. - GUESS=i586-pc-haiku - ;; + echo i586-pc-haiku + exit ;; x86_64:Haiku:*:*) - GUESS=x86_64-unknown-haiku - ;; + echo x86_64-unknown-haiku + exit ;; SX-4:SUPER-UX:*:*) - GUESS=sx4-nec-superux$UNAME_RELEASE - ;; + echo sx4-nec-superux"$UNAME_RELEASE" + exit ;; SX-5:SUPER-UX:*:*) - GUESS=sx5-nec-superux$UNAME_RELEASE - ;; + echo sx5-nec-superux"$UNAME_RELEASE" + exit ;; SX-6:SUPER-UX:*:*) - GUESS=sx6-nec-superux$UNAME_RELEASE - ;; + echo sx6-nec-superux"$UNAME_RELEASE" + exit ;; SX-7:SUPER-UX:*:*) - GUESS=sx7-nec-superux$UNAME_RELEASE - ;; + echo sx7-nec-superux"$UNAME_RELEASE" + exit ;; SX-8:SUPER-UX:*:*) - GUESS=sx8-nec-superux$UNAME_RELEASE - ;; + echo sx8-nec-superux"$UNAME_RELEASE" + exit ;; SX-8R:SUPER-UX:*:*) - GUESS=sx8r-nec-superux$UNAME_RELEASE - ;; + echo sx8r-nec-superux"$UNAME_RELEASE" + exit ;; SX-ACE:SUPER-UX:*:*) - GUESS=sxace-nec-superux$UNAME_RELEASE - ;; + echo sxace-nec-superux"$UNAME_RELEASE" + exit ;; Power*:Rhapsody:*:*) - GUESS=powerpc-apple-rhapsody$UNAME_RELEASE - ;; + echo powerpc-apple-rhapsody"$UNAME_RELEASE" + exit ;; *:Rhapsody:*:*) - GUESS=$UNAME_MACHINE-apple-rhapsody$UNAME_RELEASE - ;; - arm64:Darwin:*:*) - GUESS=aarch64-apple-darwin$UNAME_RELEASE - ;; + echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE" + exit ;; *:Darwin:*:*) - UNAME_PROCESSOR=`uname -p` - case $UNAME_PROCESSOR in - unknown) UNAME_PROCESSOR=powerpc ;; - esac - if command -v xcode-select > /dev/null 2> /dev/null && \ - ! xcode-select --print-path > /dev/null 2> /dev/null ; then - # Avoid executing cc if there is no toolchain installed as - # cc will be a stub that puts up a graphical alert - # prompting the user to install developer tools. - CC_FOR_BUILD=no_compiler_found - else - set_cc_for_build + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + eval "$set_cc_for_build" + if test "$UNAME_PROCESSOR" = unknown ; then + UNAME_PROCESSOR=powerpc fi - if test "$CC_FOR_BUILD" != no_compiler_found; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - case $UNAME_PROCESSOR in - i386) UNAME_PROCESSOR=x86_64 ;; - powerpc) UNAME_PROCESSOR=powerpc64 ;; - esac - fi - # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc - if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_PPC >/dev/null - then - UNAME_PROCESSOR=powerpc + if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then + if [ "$CC_FOR_BUILD" != no_compiler_found ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc + if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_PPC >/dev/null + then + UNAME_PROCESSOR=powerpc + fi fi elif test "$UNAME_PROCESSOR" = i386 ; then - # uname -m returns i386 or x86_64 - UNAME_PROCESSOR=$UNAME_MACHINE + # Avoid executing cc on OS X 10.9, as it ships with a stub + # that puts up a graphical alert prompting to install + # developer tools. Any system running Mac OS X 10.7 or + # later (Darwin 11 and later) is required to have a 64-bit + # processor. This is not true of the ARM version of Darwin + # that Apple uses in portable devices. + UNAME_PROCESSOR=x86_64 fi - GUESS=$UNAME_PROCESSOR-apple-darwin$UNAME_RELEASE - ;; + echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE" + exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` if test "$UNAME_PROCESSOR" = x86; then UNAME_PROCESSOR=i386 UNAME_MACHINE=pc fi - GUESS=$UNAME_PROCESSOR-$UNAME_MACHINE-nto-qnx$UNAME_RELEASE - ;; + echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE" + exit ;; *:QNX:*:4*) - GUESS=i386-pc-qnx - ;; + echo i386-pc-qnx + exit ;; NEO-*:NONSTOP_KERNEL:*:*) - GUESS=neo-tandem-nsk$UNAME_RELEASE - ;; + echo neo-tandem-nsk"$UNAME_RELEASE" + exit ;; NSE-*:NONSTOP_KERNEL:*:*) - GUESS=nse-tandem-nsk$UNAME_RELEASE - ;; + echo nse-tandem-nsk"$UNAME_RELEASE" + exit ;; NSR-*:NONSTOP_KERNEL:*:*) - GUESS=nsr-tandem-nsk$UNAME_RELEASE - ;; + echo nsr-tandem-nsk"$UNAME_RELEASE" + exit ;; NSV-*:NONSTOP_KERNEL:*:*) - GUESS=nsv-tandem-nsk$UNAME_RELEASE - ;; + echo nsv-tandem-nsk"$UNAME_RELEASE" + exit ;; NSX-*:NONSTOP_KERNEL:*:*) - GUESS=nsx-tandem-nsk$UNAME_RELEASE - ;; + echo nsx-tandem-nsk"$UNAME_RELEASE" + exit ;; *:NonStop-UX:*:*) - GUESS=mips-compaq-nonstopux - ;; + echo mips-compaq-nonstopux + exit ;; BS2000:POSIX*:*:*) - GUESS=bs2000-siemens-sysv - ;; + echo bs2000-siemens-sysv + exit ;; DS/*:UNIX_System_V:*:*) - GUESS=$UNAME_MACHINE-$UNAME_SYSTEM-$UNAME_RELEASE - ;; + echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE" + exit ;; *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 # operating systems. - if test "${cputype-}" = 386; then + if test "$cputype" = 386; then UNAME_MACHINE=i386 - elif test "x${cputype-}" != x; then - UNAME_MACHINE=$cputype + else + UNAME_MACHINE="$cputype" fi - GUESS=$UNAME_MACHINE-unknown-plan9 - ;; + echo "$UNAME_MACHINE"-unknown-plan9 + exit ;; *:TOPS-10:*:*) - GUESS=pdp10-unknown-tops10 - ;; + echo pdp10-unknown-tops10 + exit ;; *:TENEX:*:*) - GUESS=pdp10-unknown-tenex - ;; + echo pdp10-unknown-tenex + exit ;; KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) - GUESS=pdp10-dec-tops20 - ;; + echo pdp10-dec-tops20 + exit ;; XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) - GUESS=pdp10-xkl-tops20 - ;; + echo pdp10-xkl-tops20 + exit ;; *:TOPS-20:*:*) - GUESS=pdp10-unknown-tops20 - ;; + echo pdp10-unknown-tops20 + exit ;; *:ITS:*:*) - GUESS=pdp10-unknown-its - ;; + echo pdp10-unknown-its + exit ;; SEI:*:*:SEIUX) - GUESS=mips-sei-seiux$UNAME_RELEASE - ;; + echo mips-sei-seiux"$UNAME_RELEASE" + exit ;; *:DragonFly:*:*) - DRAGONFLY_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` - GUESS=$UNAME_MACHINE-unknown-dragonfly$DRAGONFLY_REL - ;; + echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" + exit ;; *:*VMS:*:*) UNAME_MACHINE=`(uname -p) 2>/dev/null` - case $UNAME_MACHINE in - A*) GUESS=alpha-dec-vms ;; - I*) GUESS=ia64-dec-vms ;; - V*) GUESS=vax-dec-vms ;; + case "$UNAME_MACHINE" in + A*) echo alpha-dec-vms ; exit ;; + I*) echo ia64-dec-vms ; exit ;; + V*) echo vax-dec-vms ; exit ;; esac ;; *:XENIX:*:SysV) - GUESS=i386-pc-xenix - ;; + echo i386-pc-xenix + exit ;; i*86:skyos:*:*) - SKYOS_REL=`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'` - GUESS=$UNAME_MACHINE-pc-skyos$SKYOS_REL - ;; + echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`" + exit ;; i*86:rdos:*:*) - GUESS=$UNAME_MACHINE-pc-rdos - ;; - i*86:Fiwix:*:*) - GUESS=$UNAME_MACHINE-pc-fiwix - ;; - *:AROS:*:*) - GUESS=$UNAME_MACHINE-unknown-aros - ;; + echo "$UNAME_MACHINE"-pc-rdos + exit ;; + i*86:AROS:*:*) + echo "$UNAME_MACHINE"-pc-aros + exit ;; x86_64:VMkernel:*:*) - GUESS=$UNAME_MACHINE-unknown-esx - ;; + echo "$UNAME_MACHINE"-unknown-esx + exit ;; amd64:Isilon\ OneFS:*:*) - GUESS=x86_64-unknown-onefs - ;; - *:Unleashed:*:*) - GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE - ;; + echo x86_64-unknown-onefs + exit ;; esac -# Do we have a guess based on uname results? -if test "x$GUESS" != x; then - echo "$GUESS" - exit -fi - -# No uname command or uname output not recognized. -set_cc_for_build -cat > "$dummy.c" < -#include -#endif -#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__) -#if defined (vax) || defined (__vax) || defined (__vax__) || defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__) -#include -#if defined(_SIZE_T_) || defined(SIGLOST) -#include -#endif -#endif -#endif -main () -{ -#if defined (sony) -#if defined (MIPSEB) - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, - I don't know.... */ - printf ("mips-sony-bsd\n"); exit (0); -#else -#include - printf ("m68k-sony-newsos%s\n", -#ifdef NEWSOS4 - "4" -#else - "" -#endif - ); exit (0); -#endif -#endif - -#if defined (NeXT) -#if !defined (__ARCHITECTURE__) -#define __ARCHITECTURE__ "m68k" -#endif - int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - if (version < 4) - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); - else - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); - exit (0); -#endif - -#if defined (MULTIMAX) || defined (n16) -#if defined (UMAXV) - printf ("ns32k-encore-sysv\n"); exit (0); -#else -#if defined (CMU) - printf ("ns32k-encore-mach\n"); exit (0); -#else - printf ("ns32k-encore-bsd\n"); exit (0); -#endif -#endif -#endif - -#if defined (__386BSD__) - printf ("i386-pc-bsd\n"); exit (0); -#endif - -#if defined (sequent) -#if defined (i386) - printf ("i386-sequent-dynix\n"); exit (0); -#endif -#if defined (ns32000) - printf ("ns32k-sequent-dynix\n"); exit (0); -#endif -#endif - -#if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); -#endif - -#if defined (vax) -#if !defined (ultrix) -#include -#if defined (BSD) -#if BSD == 43 - printf ("vax-dec-bsd4.3\n"); exit (0); -#else -#if BSD == 199006 - printf ("vax-dec-bsd4.3reno\n"); exit (0); -#else - printf ("vax-dec-bsd\n"); exit (0); -#endif -#endif -#else - printf ("vax-dec-bsd\n"); exit (0); -#endif -#else -#if defined(_SIZE_T_) || defined(SIGLOST) - struct utsname un; - uname (&un); - printf ("vax-dec-ultrix%s\n", un.release); exit (0); -#else - printf ("vax-dec-ultrix\n"); exit (0); -#endif -#endif -#endif -#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__) -#if defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__) -#if defined(_SIZE_T_) || defined(SIGLOST) - struct utsname *un; - uname (&un); - printf ("mips-dec-ultrix%s\n", un.release); exit (0); -#else - printf ("mips-dec-ultrix\n"); exit (0); -#endif -#endif -#endif - -#if defined (alliant) && defined (i860) - printf ("i860-alliant-bsd\n"); exit (0); -#endif - - exit (1); -} -EOF - -$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=`"$dummy"` && - { echo "$SYSTEM_NAME"; exit; } - -# Apollos put the system type in the environment. -test -d /usr/apollo && { echo "$ISP-apollo-$SYSTYPE"; exit; } - echo "$0: unable to guess system type" >&2 -case $UNAME_MACHINE:$UNAME_SYSTEM in +case "$UNAME_MACHINE:$UNAME_SYSTEM" in mips:Linux | mips64:Linux) # If we got here on MIPS GNU/Linux, output extra information. cat >&2 <&2 <. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). + + +# Please send patches to . +# +# Configuration subroutine to validate and canonicalize a configuration type. +# Supply the specified configuration type as an argument. +# If it is invalid, we print an error message on stderr and exit with code 1. +# Otherwise, we print the canonical config type on stdout and succeed. + +# You can get the latest version of this script from: +# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub + +# This file is supposed to be the same for all GNU packages +# and recognize all the CPU types, system types and aliases +# that are meaningful with *any* GNU software. +# Each package is responsible for reporting which valid configurations +# it does not support. The user should be able to distinguish +# a failure to support a valid configuration from a meaningless +# configuration. + +# The goal of this file is to map all the various variations of a given +# machine specification into a single specification in the form: +# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM +# or in some cases, the newer four-part form: +# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM +# It is wrong to echo any other type of specification. + +me=`echo "$0" | sed -e 's,.*/,,'` + +usage="\ +Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS + +Canonicalize a configuration name. + +Options: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to ." + +version="\ +GNU config.sub ($timestamp) + +Copyright 1992-2018 Free Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit ;; + --version | -v ) + echo "$version" ; exit ;; + --help | --h* | -h ) + echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + echo "$me: invalid option $1$help" + exit 1 ;; + + *local*) + # First pass through any local machine types. + echo "$1" + exit ;; + + * ) + break ;; + esac +done + +case $# in + 0) echo "$me: missing argument$help" >&2 + exit 1;; + 1) ;; + *) echo "$me: too many arguments$help" >&2 + exit 1;; +esac + +# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). +# Here we must recognize all the valid KERNEL-OS combinations. +maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` +case $maybe_os in + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ + kopensolaris*-gnu* | cloudabi*-eabi* | \ + storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os + basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + ;; + android-linux) + os=-linux-android + basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown + ;; + *) + basic_machine=`echo "$1" | sed 's/-[^-]*$//'` + if [ "$basic_machine" != "$1" ] + then os=`echo "$1" | sed 's/.*-/-/'` + else os=; fi + ;; +esac + +### Let's recognize common machines as not being operating systems so +### that things like config.sub decstation-3100 work. We also +### recognize some manufacturers as not being operating systems, so we +### can provide default operating systems below. +case $os in + -sun*os*) + # Prevent following clause from handling this invalid input. + ;; + -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ + -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ + -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ + -apple | -axis | -knuth | -cray | -microblaze*) + os= + basic_machine=$1 + ;; + -bluegene*) + os=-cnk + ;; + -sim | -cisco | -oki | -wec | -winbond) + os= + basic_machine=$1 + ;; + -scout) + ;; + -wrs) + os=-vxworks + basic_machine=$1 + ;; + -chorusos*) + os=-chorusos + basic_machine=$1 + ;; + -chorusrdb) + os=-chorusrdb + basic_machine=$1 + ;; + -hiux*) + os=-hiuxwe2 + ;; + -sco6) + os=-sco5v6 + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; + -sco5) + os=-sco3.2v5 + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; + -sco4) + os=-sco3.2v4 + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; + -sco3.2.[4-9]*) + os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; + -sco3.2v[4-9]*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; + -sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; + -sco*) + os=-sco3.2v2 + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; + -udk*) + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; + -isc) + os=-isc2.2 + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; + -clix*) + basic_machine=clipper-intergraph + ;; + -isc*) + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;; + -lynx*) + os=-lynxos + ;; + -ptx*) + basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'` + ;; + -psos*) + os=-psos + ;; + -mint | -mint[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; +esac + +# Decode aliases for certain CPU-COMPANY combinations. +case $basic_machine in + # Recognize the basic CPU types without company name. + # Some are omitted here because they have special meanings below. + 1750a | 580 \ + | a29k \ + | aarch64 | aarch64_be \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ + | arc | arceb \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | avr | avr32 \ + | ba \ + | be32 | be64 \ + | bfin \ + | c4x | c8051 | clipper \ + | d10v | d30v | dlx | dsp16xx \ + | e2k | epiphany \ + | fido | fr30 | frv | ft32 \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ + | i370 | i860 | i960 | ia16 | ia64 \ + | ip2k | iq2000 \ + | k1om \ + | le32 | le64 \ + | lm32 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ + | mips64octeon | mips64octeonel \ + | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ + | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ + | mipsisa32r6 | mipsisa32r6el \ + | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64r6 | mipsisa64r6el \ + | mipsisa64sb1 | mipsisa64sb1el \ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ + | mipstx39 | mipstx39el \ + | mn10200 | mn10300 \ + | moxie \ + | mt \ + | msp430 \ + | nds32 | nds32le | nds32be \ + | nios | nios2 | nios2eb | nios2el \ + | ns16k | ns32k \ + | open8 | or1k | or1knd | or32 \ + | pdp10 | pj | pjl \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ + | pru \ + | pyramid \ + | riscv32 | riscv64 \ + | rl78 | rx \ + | score \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu \ + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ + | ubicom32 \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ + | visium \ + | wasm32 \ + | x86 | xc16x | xstormy16 | xtensa \ + | z8k | z80) + basic_machine=$basic_machine-unknown + ;; + c54x) + basic_machine=tic54x-unknown + ;; + c55x) + basic_machine=tic55x-unknown + ;; + c6x) + basic_machine=tic6x-unknown + ;; + leon|leon[3-9]) + basic_machine=sparc-$basic_machine + ;; + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) + basic_machine=$basic_machine-unknown + os=-none + ;; + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65) + ;; + ms1) + basic_machine=mt-unknown + ;; + + strongarm | thumb | xscale) + basic_machine=arm-unknown + ;; + xgate) + basic_machine=$basic_machine-unknown + os=-none + ;; + xscaleeb) + basic_machine=armeb-unknown + ;; + + xscaleel) + basic_machine=armel-unknown + ;; + + # We use `pc' rather than `unknown' + # because (1) that's what they normally are, and + # (2) the word "unknown" tends to confuse beginning users. + i*86 | x86_64) + basic_machine=$basic_machine-pc + ;; + # Object if more than one company name word. + *-*-*) + echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 + exit 1 + ;; + # Recognize the basic CPU types with company name. + 580-* \ + | a29k-* \ + | aarch64-* | aarch64_be-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ + | avr-* | avr32-* \ + | ba-* \ + | be32-* | be64-* \ + | bfin-* | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* \ + | c8051-* | clipper-* | craynv-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ + | e2k-* | elxsi-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ + | h8300-* | h8500-* \ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | hexagon-* \ + | i*86-* | i860-* | i960-* | ia16-* | ia64-* \ + | ip2k-* | iq2000-* \ + | k1om-* \ + | le32-* | le64-* \ + | lm32-* \ + | m32c-* | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ + | mips64octeon-* | mips64octeonel-* \ + | mips64orion-* | mips64orionel-* \ + | mips64r5900-* | mips64r5900el-* \ + | mips64vr-* | mips64vrel-* \ + | mips64vr4100-* | mips64vr4100el-* \ + | mips64vr4300-* | mips64vr4300el-* \ + | mips64vr5000-* | mips64vr5000el-* \ + | mips64vr5900-* | mips64vr5900el-* \ + | mipsisa32-* | mipsisa32el-* \ + | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa32r6-* | mipsisa32r6el-* \ + | mipsisa64-* | mipsisa64el-* \ + | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64r6-* | mipsisa64r6el-* \ + | mipsisa64sb1-* | mipsisa64sb1el-* \ + | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ + | mipstx39-* | mipstx39el-* \ + | mmix-* \ + | mt-* \ + | msp430-* \ + | nds32-* | nds32le-* | nds32be-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ + | open8-* \ + | or1k*-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ + | pru-* \ + | pyramid-* \ + | riscv32-* | riscv64-* \ + | rl78-* | romp-* | rs6000-* | rx-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \ + | tahoe-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tile*-* \ + | tron-* \ + | ubicom32-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ + | visium-* \ + | wasm32-* \ + | we32k-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* \ + | xstormy16-* | xtensa*-* \ + | ymp-* \ + | z8k-* | z80-*) + ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown + ;; + # Recognize the various machine names and aliases which stand + # for a CPU type and a company and sometimes even an OS. + 386bsd) + basic_machine=i386-pc + os=-bsd + ;; + 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) + basic_machine=m68000-att + ;; + 3b*) + basic_machine=we32k-att + ;; + a29khif) + basic_machine=a29k-amd + os=-udi + ;; + abacus) + basic_machine=abacus-unknown + ;; + adobe68k) + basic_machine=m68010-adobe + os=-scout + ;; + alliant | fx80) + basic_machine=fx80-alliant + ;; + altos | altos3068) + basic_machine=m68k-altos + ;; + am29k) + basic_machine=a29k-none + os=-bsd + ;; + amd64) + basic_machine=x86_64-pc + ;; + amd64-*) + basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; + amdahl) + basic_machine=580-amdahl + os=-sysv + ;; + amiga | amiga-*) + basic_machine=m68k-unknown + ;; + amigaos | amigados) + basic_machine=m68k-unknown + os=-amigaos + ;; + amigaunix | amix) + basic_machine=m68k-unknown + os=-sysv4 + ;; + apollo68) + basic_machine=m68k-apollo + os=-sysv + ;; + apollo68bsd) + basic_machine=m68k-apollo + os=-bsd + ;; + aros) + basic_machine=i386-pc + os=-aros + ;; + asmjs) + basic_machine=asmjs-unknown + ;; + aux) + basic_machine=m68k-apple + os=-aux + ;; + balance) + basic_machine=ns32k-sequent + os=-dynix + ;; + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'` + os=-linux + ;; + bluegene*) + basic_machine=powerpc-ibm + os=-cnk + ;; + c54x-*) + basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; + c55x-*) + basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; + c6x-*) + basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; + c90) + basic_machine=c90-cray + os=-unicos + ;; + cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; + convex-c1) + basic_machine=c1-convex + os=-bsd + ;; + convex-c2) + basic_machine=c2-convex + os=-bsd + ;; + convex-c32) + basic_machine=c32-convex + os=-bsd + ;; + convex-c34) + basic_machine=c34-convex + os=-bsd + ;; + convex-c38) + basic_machine=c38-convex + os=-bsd + ;; + cray | j90) + basic_machine=j90-cray + os=-unicos + ;; + craynv) + basic_machine=craynv-cray + os=-unicosmp + ;; + cr16 | cr16-*) + basic_machine=cr16-unknown + os=-elf + ;; + crds | unos) + basic_machine=m68k-crds + ;; + crisv32 | crisv32-* | etraxfs*) + basic_machine=crisv32-axis + ;; + cris | cris-* | etrax*) + basic_machine=cris-axis + ;; + crx) + basic_machine=crx-unknown + os=-elf + ;; + da30 | da30-*) + basic_machine=m68k-da30 + ;; + decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) + basic_machine=mips-dec + ;; + decsystem10* | dec10*) + basic_machine=pdp10-dec + os=-tops10 + ;; + decsystem20* | dec20*) + basic_machine=pdp10-dec + os=-tops20 + ;; + delta | 3300 | motorola-3300 | motorola-delta \ + | 3300-motorola | delta-motorola) + basic_machine=m68k-motorola + ;; + delta88) + basic_machine=m88k-motorola + os=-sysv3 + ;; + dicos) + basic_machine=i686-pc + os=-dicos + ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp + ;; + dpx20 | dpx20-*) + basic_machine=rs6000-bull + os=-bosx + ;; + dpx2*) + basic_machine=m68k-bull + os=-sysv3 + ;; + e500v[12]) + basic_machine=powerpc-unknown + os=$os"spe" + ;; + e500v[12]-*) + basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` + os=$os"spe" + ;; + ebmon29k) + basic_machine=a29k-amd + os=-ebmon + ;; + elxsi) + basic_machine=elxsi-elxsi + os=-bsd + ;; + encore | umax | mmax) + basic_machine=ns32k-encore + ;; + es1800 | OSE68k | ose68k | ose | OSE) + basic_machine=m68k-ericsson + os=-ose + ;; + fx2800) + basic_machine=i860-alliant + ;; + genix) + basic_machine=ns32k-ns + ;; + gmicro) + basic_machine=tron-gmicro + os=-sysv + ;; + go32) + basic_machine=i386-pc + os=-go32 + ;; + h3050r* | hiux*) + basic_machine=hppa1.1-hitachi + os=-hiuxwe2 + ;; + h8300hms) + basic_machine=h8300-hitachi + os=-hms + ;; + h8300xray) + basic_machine=h8300-hitachi + os=-xray + ;; + h8500hms) + basic_machine=h8500-hitachi + os=-hms + ;; + harris) + basic_machine=m88k-harris + os=-sysv3 + ;; + hp300-*) + basic_machine=m68k-hp + ;; + hp300bsd) + basic_machine=m68k-hp + os=-bsd + ;; + hp300hpux) + basic_machine=m68k-hp + os=-hpux + ;; + hp3k9[0-9][0-9] | hp9[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hp9k2[0-9][0-9] | hp9k31[0-9]) + basic_machine=m68000-hp + ;; + hp9k3[2-9][0-9]) + basic_machine=m68k-hp + ;; + hp9k6[0-9][0-9] | hp6[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hp9k7[0-79][0-9] | hp7[0-79][0-9]) + basic_machine=hppa1.1-hp + ;; + hp9k78[0-9] | hp78[0-9]) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[0-9][13679] | hp8[0-9][13679]) + basic_machine=hppa1.1-hp + ;; + hp9k8[0-9][0-9] | hp8[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hppaosf) + basic_machine=hppa1.1-hp + os=-osf + ;; + hppro) + basic_machine=hppa1.1-hp + os=-proelf + ;; + i370-ibm* | ibm*) + basic_machine=i370-ibm + ;; + i*86v32) + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` + os=-sysv32 + ;; + i*86v4*) + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` + os=-sysv4 + ;; + i*86v) + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` + os=-sysv + ;; + i*86sol2) + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` + os=-solaris2 + ;; + i386mach) + basic_machine=i386-mach + os=-mach + ;; + vsta) + basic_machine=i386-unknown + os=-vsta + ;; + iris | iris4d) + basic_machine=mips-sgi + case $os in + -irix*) + ;; + *) + os=-irix4 + ;; + esac + ;; + isi68 | isi) + basic_machine=m68k-isi + os=-sysv + ;; + leon-*|leon[3-9]-*) + basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'` + ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux + ;; + m68knommu-*) + basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'` + os=-linux + ;; + magnum | m3230) + basic_machine=mips-mips + os=-sysv + ;; + merlin) + basic_machine=ns32k-utek + os=-sysv + ;; + microblaze*) + basic_machine=microblaze-xilinx + ;; + mingw64) + basic_machine=x86_64-pc + os=-mingw64 + ;; + mingw32) + basic_machine=i686-pc + os=-mingw32 + ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; + miniframe) + basic_machine=m68000-convergent + ;; + *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; + mips3*-*) + basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'` + ;; + mips3*) + basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown + ;; + monitor) + basic_machine=m68k-rom68k + os=-coff + ;; + morphos) + basic_machine=powerpc-unknown + os=-morphos + ;; + moxiebox) + basic_machine=moxie-unknown + os=-moxiebox + ;; + msdos) + basic_machine=i386-pc + os=-msdos + ;; + ms1-*) + basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'` + ;; + msys) + basic_machine=i686-pc + os=-msys + ;; + mvs) + basic_machine=i370-ibm + os=-mvs + ;; + nacl) + basic_machine=le32-unknown + os=-nacl + ;; + ncr3000) + basic_machine=i486-ncr + os=-sysv4 + ;; + netbsd386) + basic_machine=i386-unknown + os=-netbsd + ;; + netwinder) + basic_machine=armv4l-rebel + os=-linux + ;; + news | news700 | news800 | news900) + basic_machine=m68k-sony + os=-newsos + ;; + news1000) + basic_machine=m68030-sony + os=-newsos + ;; + news-3600 | risc-news) + basic_machine=mips-sony + os=-newsos + ;; + necv70) + basic_machine=v70-nec + os=-sysv + ;; + next | m*-next) + basic_machine=m68k-next + case $os in + -nextstep* ) + ;; + -ns2*) + os=-nextstep2 + ;; + *) + os=-nextstep3 + ;; + esac + ;; + nh3000) + basic_machine=m68k-harris + os=-cxux + ;; + nh[45]000) + basic_machine=m88k-harris + os=-cxux + ;; + nindy960) + basic_machine=i960-intel + os=-nindy + ;; + mon960) + basic_machine=i960-intel + os=-mon960 + ;; + nonstopux) + basic_machine=mips-compaq + os=-nonstopux + ;; + np1) + basic_machine=np1-gould + ;; + neo-tandem) + basic_machine=neo-tandem + ;; + nse-tandem) + basic_machine=nse-tandem + ;; + nsr-tandem) + basic_machine=nsr-tandem + ;; + nsv-tandem) + basic_machine=nsv-tandem + ;; + nsx-tandem) + basic_machine=nsx-tandem + ;; + op50n-* | op60c-*) + basic_machine=hppa1.1-oki + os=-proelf + ;; + openrisc | openrisc-*) + basic_machine=or32-unknown + ;; + os400) + basic_machine=powerpc-ibm + os=-os400 + ;; + OSE68000 | ose68000) + basic_machine=m68000-ericsson + os=-ose + ;; + os68k) + basic_machine=m68k-none + os=-os68k + ;; + pa-hitachi) + basic_machine=hppa1.1-hitachi + os=-hiuxwe2 + ;; + paragon) + basic_machine=i860-intel + os=-osf + ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'` + os=-linux + ;; + pbd) + basic_machine=sparc-tti + ;; + pbb) + basic_machine=m68k-tti + ;; + pc532 | pc532-*) + basic_machine=ns32k-pc532 + ;; + pc98) + basic_machine=i386-pc + ;; + pc98-*) + basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; + pentium | p5 | k5 | k6 | nexgen | viac3) + basic_machine=i586-pc + ;; + pentiumpro | p6 | 6x86 | athlon | athlon_*) + basic_machine=i686-pc + ;; + pentiumii | pentium2 | pentiumiii | pentium3) + basic_machine=i686-pc + ;; + pentium4) + basic_machine=i786-pc + ;; + pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) + basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; + pentiumpro-* | p6-* | 6x86-* | athlon-*) + basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; + pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) + basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; + pentium4-*) + basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; + pn) + basic_machine=pn-gould + ;; + power) basic_machine=power-ibm + ;; + ppc | ppcbe) basic_machine=powerpc-unknown + ;; + ppc-* | ppcbe-*) + basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; + ppcle | powerpclittle) + basic_machine=powerpcle-unknown + ;; + ppcle-* | powerpclittle-*) + basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; + ppc64) basic_machine=powerpc64-unknown + ;; + ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; + ppc64le | powerpc64little) + basic_machine=powerpc64le-unknown + ;; + ppc64le-* | powerpc64little-*) + basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; + ps2) + basic_machine=i386-ibm + ;; + pw32) + basic_machine=i586-unknown + os=-pw32 + ;; + rdos | rdos64) + basic_machine=x86_64-pc + os=-rdos + ;; + rdos32) + basic_machine=i386-pc + os=-rdos + ;; + rom68k) + basic_machine=m68k-rom68k + os=-coff + ;; + rm[46]00) + basic_machine=mips-siemens + ;; + rtpc | rtpc-*) + basic_machine=romp-ibm + ;; + s390 | s390-*) + basic_machine=s390-ibm + ;; + s390x | s390x-*) + basic_machine=s390x-ibm + ;; + sa29200) + basic_machine=a29k-amd + os=-udi + ;; + sb1) + basic_machine=mipsisa64sb1-unknown + ;; + sb1el) + basic_machine=mipsisa64sb1el-unknown + ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; + sei) + basic_machine=mips-sei + os=-seiux + ;; + sequent) + basic_machine=i386-sequent + ;; + sh5el) + basic_machine=sh5le-unknown + ;; + simso-wrs) + basic_machine=sparclite-wrs + os=-vxworks + ;; + sps7) + basic_machine=m68k-bull + os=-sysv2 + ;; + spur) + basic_machine=spur-unknown + ;; + st2000) + basic_machine=m68k-tandem + ;; + stratus) + basic_machine=i860-stratus + os=-sysv4 + ;; + strongarm-* | thumb-*) + basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; + sun2) + basic_machine=m68000-sun + ;; + sun2os3) + basic_machine=m68000-sun + os=-sunos3 + ;; + sun2os4) + basic_machine=m68000-sun + os=-sunos4 + ;; + sun3os3) + basic_machine=m68k-sun + os=-sunos3 + ;; + sun3os4) + basic_machine=m68k-sun + os=-sunos4 + ;; + sun4os3) + basic_machine=sparc-sun + os=-sunos3 + ;; + sun4os4) + basic_machine=sparc-sun + os=-sunos4 + ;; + sun4sol2) + basic_machine=sparc-sun + os=-solaris2 + ;; + sun3 | sun3-*) + basic_machine=m68k-sun + ;; + sun4) + basic_machine=sparc-sun + ;; + sun386 | sun386i | roadrunner) + basic_machine=i386-sun + ;; + sv1) + basic_machine=sv1-cray + os=-unicos + ;; + symmetry) + basic_machine=i386-sequent + os=-dynix + ;; + t3e) + basic_machine=alphaev5-cray + os=-unicos + ;; + t90) + basic_machine=t90-cray + os=-unicos + ;; + tile*) + basic_machine=$basic_machine-unknown + os=-linux-gnu + ;; + tx39) + basic_machine=mipstx39-unknown + ;; + tx39el) + basic_machine=mipstx39el-unknown + ;; + toad1) + basic_machine=pdp10-xkl + os=-tops20 + ;; + tower | tower-32) + basic_machine=m68k-ncr + ;; + tpf) + basic_machine=s390x-ibm + os=-tpf + ;; + udi29k) + basic_machine=a29k-amd + os=-udi + ;; + ultra3) + basic_machine=a29k-nyu + os=-sym1 + ;; + v810 | necv810) + basic_machine=v810-nec + os=-none + ;; + vaxv) + basic_machine=vax-dec + os=-sysv + ;; + vms) + basic_machine=vax-dec + os=-vms + ;; + vpp*|vx|vx-*) + basic_machine=f301-fujitsu + ;; + vxworks960) + basic_machine=i960-wrs + os=-vxworks + ;; + vxworks68) + basic_machine=m68k-wrs + os=-vxworks + ;; + vxworks29k) + basic_machine=a29k-wrs + os=-vxworks + ;; + w65*) + basic_machine=w65-wdc + os=-none + ;; + w89k-*) + basic_machine=hppa1.1-winbond + os=-proelf + ;; + x64) + basic_machine=x86_64-pc + ;; + xbox) + basic_machine=i686-pc + os=-mingw32 + ;; + xps | xps100) + basic_machine=xps100-honeywell + ;; + xscale-* | xscalee[bl]-*) + basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'` + ;; + ymp) + basic_machine=ymp-cray + os=-unicos + ;; + none) + basic_machine=none-none + os=-none + ;; + +# Here we handle the default manufacturer of certain CPU types. It is in +# some cases the only manufacturer, in others, it is the most popular. + w89k) + basic_machine=hppa1.1-winbond + ;; + op50n) + basic_machine=hppa1.1-oki + ;; + op60c) + basic_machine=hppa1.1-oki + ;; + romp) + basic_machine=romp-ibm + ;; + mmix) + basic_machine=mmix-knuth + ;; + rs6000) + basic_machine=rs6000-ibm + ;; + vax) + basic_machine=vax-dec + ;; + pdp11) + basic_machine=pdp11-dec + ;; + we32k) + basic_machine=we32k-att + ;; + sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) + basic_machine=sh-unknown + ;; + cydra) + basic_machine=cydra-cydrome + ;; + orion) + basic_machine=orion-highlevel + ;; + orion105) + basic_machine=clipper-highlevel + ;; + mac | mpw | mac-mpw) + basic_machine=m68k-apple + ;; + pmac | pmac-mpw) + basic_machine=powerpc-apple + ;; + *-unknown) + # Make sure to match an already-canonicalized machine name. + ;; + *) + echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 + exit 1 + ;; +esac + +# Here we canonicalize certain aliases for manufacturers. +case $basic_machine in + *-digital*) + basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'` + ;; + *-commodore*) + basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'` + ;; + *) + ;; +esac + +# Decode manufacturer-specific aliases for certain operating systems. + +if [ x"$os" != x"" ] +then +case $os in + # First match some system type aliases that might get confused + # with valid system types. + # -solaris* is a basic system type, with this one exception. + -auroraux) + os=-auroraux + ;; + -solaris1 | -solaris1.*) + os=`echo $os | sed -e 's|solaris1|sunos4|'` + ;; + -solaris) + os=-solaris2 + ;; + -unixware*) + os=-sysv4.2uw + ;; + -gnu/linux*) + os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` + ;; + # es1800 is here to avoid being matched by es* (a different OS) + -es1800*) + os=-ose + ;; + # Now accept the basic system types. + # The portable systems comes first. + # Each alternative MUST end in a * to match a version number. + # -sysv* is not here because it comes later, after sysvr4. + -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ + | -sym* | -kopensolaris* | -plan9* \ + | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ + | -aos* | -aros* | -cloudabi* | -sortix* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ + | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \ + | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ + | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ + | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \ + | -midnightbsd*) + # Remember, each alternative MUST END IN *, to match a version number. + ;; + -qnx*) + case $basic_machine in + x86-* | i*86-*) + ;; + *) + os=-nto$os + ;; + esac + ;; + -nto-qnx*) + ;; + -nto*) + os=`echo $os | sed -e 's|nto|nto-qnx|'` + ;; + -sim | -xray | -os68k* | -v88r* \ + | -windows* | -osx | -abug | -netware* | -os9* \ + | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) + ;; + -mac*) + os=`echo "$os" | sed -e 's|mac|macos|'` + ;; + -linux-dietlibc) + os=-linux-dietlibc + ;; + -linux*) + os=`echo $os | sed -e 's|linux|linux-gnu|'` + ;; + -sunos5*) + os=`echo "$os" | sed -e 's|sunos5|solaris2|'` + ;; + -sunos6*) + os=`echo "$os" | sed -e 's|sunos6|solaris3|'` + ;; + -opened*) + os=-openedition + ;; + -os400*) + os=-os400 + ;; + -wince*) + os=-wince + ;; + -utek*) + os=-bsd + ;; + -dynix*) + os=-bsd + ;; + -acis*) + os=-aos + ;; + -atheos*) + os=-atheos + ;; + -syllable*) + os=-syllable + ;; + -386bsd) + os=-bsd + ;; + -ctix* | -uts*) + os=-sysv + ;; + -nova*) + os=-rtmk-nova + ;; + -ns2) + os=-nextstep2 + ;; + -nsk*) + os=-nsk + ;; + # Preserve the version number of sinix5. + -sinix5.*) + os=`echo $os | sed -e 's|sinix|sysv|'` + ;; + -sinix*) + os=-sysv4 + ;; + -tpf*) + os=-tpf + ;; + -triton*) + os=-sysv3 + ;; + -oss*) + os=-sysv3 + ;; + -svr4*) + os=-sysv4 + ;; + -svr3) + os=-sysv3 + ;; + -sysvr4) + os=-sysv4 + ;; + # This must come after -sysvr4. + -sysv*) + ;; + -ose*) + os=-ose + ;; + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + os=-mint + ;; + -zvmoe) + os=-zvmoe + ;; + -dicos*) + os=-dicos + ;; + -pikeos*) + # Until real need of OS specific support for + # particular features comes up, bare metal + # configurations are quite functional. + case $basic_machine in + arm*) + os=-eabi + ;; + *) + os=-elf + ;; + esac + ;; + -nacl*) + ;; + -ios) + ;; + -none) + ;; + *) + # Get rid of the `-' at the beginning of $os. + os=`echo $os | sed 's/[^-]*-//'` + echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2 + exit 1 + ;; +esac +else + +# Here we handle the default operating systems that come with various machines. +# The value should be what the vendor currently ships out the door with their +# machine or put another way, the most popular os provided with the machine. + +# Note that if you're going to try to match "-MANUFACTURER" here (say, +# "-sun"), then you have to tell the case statement up towards the top +# that MANUFACTURER isn't an operating system. Otherwise, code above +# will signal an error saying that MANUFACTURER isn't an operating +# system, and we'll never get to this point. + +case $basic_machine in + score-*) + os=-elf + ;; + spu-*) + os=-elf + ;; + *-acorn) + os=-riscix1.2 + ;; + arm*-rebel) + os=-linux + ;; + arm*-semi) + os=-aout + ;; + c4x-* | tic4x-*) + os=-coff + ;; + c8051-*) + os=-elf + ;; + hexagon-*) + os=-elf + ;; + tic54x-*) + os=-coff + ;; + tic55x-*) + os=-coff + ;; + tic6x-*) + os=-coff + ;; + # This must come before the *-dec entry. + pdp10-*) + os=-tops20 + ;; + pdp11-*) + os=-none + ;; + *-dec | vax-*) + os=-ultrix4.2 + ;; + m68*-apollo) + os=-domain + ;; + i386-sun) + os=-sunos4.0.2 + ;; + m68000-sun) + os=-sunos3 + ;; + m68*-cisco) + os=-aout + ;; + mep-*) + os=-elf + ;; + mips*-cisco) + os=-elf + ;; + mips*-*) + os=-elf + ;; + or32-*) + os=-coff + ;; + *-tti) # must be before sparc entry or we get the wrong os. + os=-sysv3 + ;; + sparc-* | *-sun) + os=-sunos4.1.1 + ;; + pru-*) + os=-elf + ;; + *-be) + os=-beos + ;; + *-ibm) + os=-aix + ;; + *-knuth) + os=-mmixware + ;; + *-wec) + os=-proelf + ;; + *-winbond) + os=-proelf + ;; + *-oki) + os=-proelf + ;; + *-hp) + os=-hpux + ;; + *-hitachi) + os=-hiux + ;; + i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) + os=-sysv + ;; + *-cbm) + os=-amigaos + ;; + *-dg) + os=-dgux + ;; + *-dolphin) + os=-sysv3 + ;; + m68k-ccur) + os=-rtu + ;; + m88k-omron*) + os=-luna + ;; + *-next) + os=-nextstep + ;; + *-sequent) + os=-ptx + ;; + *-crds) + os=-unos + ;; + *-ns) + os=-genix + ;; + i370-*) + os=-mvs + ;; + *-gould) + os=-sysv + ;; + *-highlevel) + os=-bsd + ;; + *-encore) + os=-bsd + ;; + *-sgi) + os=-irix + ;; + *-siemens) + os=-sysv4 + ;; + *-masscomp) + os=-rtu + ;; + f30[01]-fujitsu | f700-fujitsu) + os=-uxpv + ;; + *-rom68k) + os=-coff + ;; + *-*bug) + os=-coff + ;; + *-apple) + os=-macos + ;; + *-atari*) + os=-mint + ;; + *) + os=-none + ;; +esac +fi + +# Here we handle the case where we know the os, and the CPU type, but not the +# manufacturer. We pick the logical manufacturer. +vendor=unknown +case $basic_machine in + *-unknown) + case $os in + -riscix*) + vendor=acorn + ;; + -sunos*) + vendor=sun + ;; + -cnk*|-aix*) + vendor=ibm + ;; + -beos*) + vendor=be + ;; + -hpux*) + vendor=hp + ;; + -mpeix*) + vendor=hp + ;; + -hiux*) + vendor=hitachi + ;; + -unos*) + vendor=crds + ;; + -dgux*) + vendor=dg + ;; + -luna*) + vendor=omron + ;; + -genix*) + vendor=ns + ;; + -mvs* | -opened*) + vendor=ibm + ;; + -os400*) + vendor=ibm + ;; + -ptx*) + vendor=sequent + ;; + -tpf*) + vendor=ibm + ;; + -vxsim* | -vxworks* | -windiss*) + vendor=wrs + ;; + -aux*) + vendor=apple + ;; + -hms*) + vendor=hitachi + ;; + -mpw* | -macos*) + vendor=apple + ;; + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + vendor=atari + ;; + -vos*) + vendor=stratus + ;; + esac + basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"` + ;; +esac + +echo "$basic_machine$os" +exit + +# Local variables: +# eval: (add-hook 'write-file-functions 'time-stamp) +# time-stamp-start: "timestamp='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: diff --git a/3rdparty/curl-7.84.0/configure b/3rdparty/curl-7.80.0/configure similarity index 95% rename from 3rdparty/curl-7.84.0/configure rename to 3rdparty/curl-7.80.0/configure index c16635f7..2d73516b 100644 --- a/3rdparty/curl-7.84.0/configure +++ b/3rdparty/curl-7.80.0/configure @@ -12,7 +12,7 @@ # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. # -# Copyright (c) 1998 - 2022 Daniel Stenberg, +# Copyright (c) 1998 - 2021 Daniel Stenberg, # This configure script may be copied, distributed and modified under the # terms of the curl license; see COPYING for more details @@ -898,6 +898,7 @@ ac_includes_default="\ #endif" ac_header_c_list= +enable_option_checking=no ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS @@ -920,7 +921,10 @@ DOING_CURL_SYMBOL_HIDING_TRUE USE_UNIX_SOCKETS BUILD_LIBHOSTNAME_FALSE BUILD_LIBHOSTNAME_TRUE +USE_EMBEDDED_ARES_FALSE +USE_EMBEDDED_ARES_TRUE USE_ARES +subdirs USE_MANUAL_FALSE USE_MANUAL_TRUE MANOPT @@ -928,7 +932,6 @@ NROFF PERL FISH_FUNCTIONS_DIR ZSH_FUNCTIONS_DIR -USE_MSH3 USE_QUICHE USE_NGHTTP3 USE_NGTCP2_CRYPTO_GNUTLS @@ -936,7 +939,6 @@ USE_NGTCP2_CRYPTO_OPENSSL USE_NGTCP2 USE_NGHTTP2 IDN_ENABLED -CURL_PLIST_VERSION CURL_LT_SHLIB_USE_VERSIONED_SYMBOLS_FALSE CURL_LT_SHLIB_USE_VERSIONED_SYMBOLS_TRUE CURL_LT_SHLIB_VERSIONED_FLAVOUR @@ -955,6 +957,7 @@ NSS_LIBS USE_NSS USE_RUSTLS USE_BEARSSL +USE_MESALINK USE_WOLFSSL USE_MBEDTLS HAVE_GNUTLS_SRP @@ -1027,7 +1030,6 @@ DSYMUTIL MANIFEST_TOOL RANLIB ac_ct_AR -FILECMD LN_S NM ac_ct_DUMPBIN @@ -1174,9 +1176,9 @@ with_openssl with_gnutls with_mbedtls with_wolfssl +with_mesalink with_bearssl with_rustls -with_nss_deprecated with_nss with_darwinssl enable_largefile @@ -1238,7 +1240,6 @@ with_nghttp2 with_ngtcp2 with_nghttp3 with_quiche -with_msh3 with_zsh_functions_dir with_fish_functions_dir enable_threaded_resolver @@ -1261,7 +1262,6 @@ enable_progress_meter enable_dnsshuffle enable_get_easy_options enable_alt_svc -enable_headers_api enable_hsts ' ac_precious_vars='build_alias @@ -1274,7 +1274,7 @@ LIBS CPPFLAGS CPP LT_SYS_LIBRARY_PATH' - +ac_subdirs_all='ares' # Initialize some variables set by options. ac_init_help= @@ -2030,8 +2030,6 @@ Optional Features: Disable curl_easy_options --enable-alt-svc Enable alt-svc support --disable-alt-svc Disable alt-svc support - --enable-headers-api Enable headers-api support - --disable-headers-api Disable headers-api support --enable-hsts Enable HSTS support --disable-hsts Disable HSTS support @@ -2053,11 +2051,12 @@ Optional Packages: installation root --with-wolfssl=PATH where to look for WolfSSL, PATH points to the installation root (default: system lib default) + --with-mesalink=PATH where to look for MesaLink, PATH points to the + installation root --with-bearssl=PATH where to look for BearSSL, PATH points to the installation root --with-rustls=PATH where to look for rustls, PATH points to the installation root - --with-nss-deprecated confirm you realize NSS is going away --with-nss=PATH where to look for NSS, PATH points to the installation root @@ -2139,8 +2138,6 @@ Optional Packages: --without-nghttp3 Disable nghttp3 usage --with-quiche=PATH Enable quiche usage --without-quiche Disable quiche usage - --with-msh3=PATH Enable msh3 usage - --without-msh3 Disable msh3 usage --with-zsh-functions-dir=PATH Install zsh completions to PATH --without-zsh-functions-dir @@ -2236,7 +2233,7 @@ Copyright (C) 2021 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. -Copyright (c) 1998 - 2022 Daniel Stenberg, +Copyright (c) 1998 - 2021 Daniel Stenberg, This configure script may be copied, distributed and modified under the terms of the curl license; see COPYING for more details _ACEOF @@ -5585,45 +5582,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if _Atomic is available" >&5 -printf %s "checking if _Atomic is available... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - - $curl_includes_unistd - -int main (void) -{ - - _Atomic int i = 0; - - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - -printf "%s\n" "#define HAVE_ATOMIC 1" >>confdefs.h - - tst_atomic="yes" - -else $as_nop - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - tst_atomic="no" - -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 printf %s "checking for a sed that does not truncate output... " >&6; } if test ${ac_cv_path_SED+y} @@ -5876,7 +5834,7 @@ fi fi CPPFLAGS="$CPPFLAGS -DNDEBUG" - CFLAGS="$CFLAGS -O0 -g -fprofile-arcs -ftest-coverage" + CFLAGS="$CLAGS -O0 -g -fprofile-arcs -ftest-coverage" LIBS="$LIBS -lgcov" fi @@ -6572,7 +6530,7 @@ PKGADD_VENDOR="curl.se" - curl_ssl_msg="no (--with-{openssl,gnutls,nss,mbedtls,wolfssl,schannel,secure-transport,amissl,bearssl,rustls} )" + curl_ssl_msg="no (--with-{openssl,gnutls,nss,mbedtls,wolfssl,schannel,secure-transport,mesalink,amissl,bearssl,rustls} )" curl_ssh_msg="no (--with-{libssh,libssh2})" curl_zlib_msg="no (--with-zlib)" curl_brotli_msg="no (--with-brotli)" @@ -6594,12 +6552,11 @@ curl_verbose_msg="enabled (--disable-verbose)" curl_rtmp_msg="no (--with-librtmp)" curl_psl_msg="no (--with-libpsl)" curl_altsvc_msg="enabled (--disable-alt-svc)" -curl_headers_msg="enabled (--disable-headers-api)" curl_hsts_msg="enabled (--disable-hsts)" ssl_backends= curl_h1_msg="enabled (internal)" curl_h2_msg="no (--with-nghttp2, --with-hyper)" - curl_h3_msg="no (--with-ngtcp2, --with-quiche --with-msh3)" + curl_h3_msg="no (--with-ngtcp2, --with-quiche)" enable_altsvc="yes" hsts="yes" @@ -6650,26 +6607,22 @@ if test ${with_ssl+y} then : withval=$with_ssl; OPT_SSL=$withval OPT_OPENSSL=$withval - if test X"$withval" != Xno; then - test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE + test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE else $as_nop }OpenSSL" fi - fi # Check whether --with-openssl was given. if test ${with_openssl+y} then : withval=$with_openssl; OPT_OPENSSL=$withval - if test X"$withval" != Xno; then - test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE + test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE else $as_nop }OpenSSL" fi - fi OPT_GNUTLS=no @@ -6677,13 +6630,11 @@ OPT_GNUTLS=no if test ${with_gnutls+y} then : withval=$with_gnutls; OPT_GNUTLS=$withval - if test X"$withval" != Xno; then - test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE + test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE else $as_nop }GnuTLS" fi - fi OPT_MBEDTLS=no @@ -6691,13 +6642,11 @@ OPT_MBEDTLS=no if test ${with_mbedtls+y} then : withval=$with_mbedtls; OPT_MBEDTLS=$withval - if test X"$withval" != Xno; then - test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE + test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE else $as_nop }mbedTLS" fi - fi OPT_WOLFSSL=no @@ -6705,13 +6654,23 @@ OPT_WOLFSSL=no if test ${with_wolfssl+y} then : withval=$with_wolfssl; OPT_WOLFSSL=$withval - if test X"$withval" != Xno; then - test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE + test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE else $as_nop }wolfSSL" fi - fi + +OPT_MESALINK=no + +# Check whether --with-mesalink was given. +if test ${with_mesalink+y} +then : + withval=$with_mesalink; OPT_MESALINK=$withval + test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE +else $as_nop + }MesaLink" +fi + OPT_BEARSSL=no @@ -6719,13 +6678,11 @@ OPT_BEARSSL=no if test ${with_bearssl+y} then : withval=$with_bearssl; OPT_BEARSSL=$withval - if test X"$withval" != Xno; then - test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE + test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE else $as_nop }BearSSL" fi - fi OPT_RUSTLS=no @@ -6733,26 +6690,11 @@ OPT_RUSTLS=no if test ${with_rustls+y} then : withval=$with_rustls; OPT_RUSTLS=$withval - if test X"$withval" != Xno; then - test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE + test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE else $as_nop }rustls" fi - experimental="$experimental rustls" - fi - -OPT_NSS_AWARE=no - -# Check whether --with-nss-deprecated was given. -if test ${with_nss_deprecated+y} -then : - withval=$with_nss_deprecated; if test X"$withval" != Xno; then - OPT_NSS_AWARE=$withval - fi - -fi - OPT_NSS=no @@ -6760,17 +6702,9 @@ OPT_NSS=no if test ${with_nss+y} then : withval=$with_nss; OPT_NSS=$withval - if test X"$withval" != Xno; then - - if test X"$OPT_NSS_AWARE" = "Xno" ; then - as_fn_error $? "NSS use must be confirmed using --with-nss-deprecated. NSS support will be dropped from curl in August 2022. See docs/DEPRECATE.md" "$LINENO" 5 - fi - - test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE + test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE else $as_nop }NSS" - fi - fi @@ -6784,6 +6718,7 @@ Select from these: --with-bearssl --with-gnutls --with-mbedtls + --with-mesalink --with-nss --with-openssl (also works for BoringSSL and libressl) --with-rustls @@ -6887,6 +6822,7 @@ AR_FLAGS=cr + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 printf %s "checking for grep that handles long lines and -e... " >&6; } if test ${ac_cv_path_GREP+y} @@ -8027,8 +7963,8 @@ esac -macro_version='2.4.7' -macro_revision='2.4.7' +macro_version='2.4.6' +macro_revision='2.4.6' @@ -8439,13 +8375,13 @@ else mingw*) lt_bad_file=conftest.nm/nofile ;; *) lt_bad_file=/dev/null ;; esac - case `"$tmp_nm" -B $lt_bad_file 2>&1 | $SED '1q'` in + case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in *$lt_bad_file* | *'Invalid file or object type'*) lt_cv_path_NM="$tmp_nm -B" break 2 ;; *) - case `"$tmp_nm" -p /dev/null 2>&1 | $SED '1q'` in + case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in */dev/null*) lt_cv_path_NM="$tmp_nm -p" break 2 @@ -8583,7 +8519,7 @@ esac fi fi - case `$DUMPBIN -symbols -headers /dev/null 2>&1 | $SED '1q'` in + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in *COFF*) DUMPBIN="$DUMPBIN -symbols -headers" ;; @@ -8687,7 +8623,7 @@ else $as_nop lt_cv_sys_max_cmd_len=8192; ;; - bitrig* | darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*) + bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -8730,7 +8666,7 @@ else $as_nop sysv5* | sco5v6* | sysv4.2uw2*) kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | $SED 's/.*[ ]//'` + lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'` else lt_cv_sys_max_cmd_len=32768 fi @@ -8935,114 +8871,6 @@ esac -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}file", so it can be a program name with args. -set dummy ${ac_tool_prefix}file; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_FILECMD+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test -n "$FILECMD"; then - ac_cv_prog_FILECMD="$FILECMD" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_FILECMD="${ac_tool_prefix}file" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -FILECMD=$ac_cv_prog_FILECMD -if test -n "$FILECMD"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FILECMD" >&5 -printf "%s\n" "$FILECMD" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_FILECMD"; then - ac_ct_FILECMD=$FILECMD - # Extract the first word of "file", so it can be a program name with args. -set dummy file; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_FILECMD+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test -n "$ac_ct_FILECMD"; then - ac_cv_prog_ac_ct_FILECMD="$ac_ct_FILECMD" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_FILECMD="file" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_FILECMD=$ac_cv_prog_ac_ct_FILECMD -if test -n "$ac_ct_FILECMD"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_FILECMD" >&5 -printf "%s\n" "$ac_ct_FILECMD" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - if test "x$ac_ct_FILECMD" = x; then - FILECMD=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - FILECMD=$ac_ct_FILECMD - fi -else - FILECMD="$ac_cv_prog_FILECMD" -fi - - - - - - - if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 @@ -9183,7 +9011,7 @@ beos*) bsdi[45]*) lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' - lt_cv_file_magic_cmd='$FILECMD -L' + lt_cv_file_magic_cmd='/usr/bin/file -L' lt_cv_file_magic_test_file=/shlib/libc.so ;; @@ -9217,14 +9045,14 @@ darwin* | rhapsody*) lt_cv_deplibs_check_method=pass_all ;; -freebsd* | dragonfly* | midnightbsd*) +freebsd* | dragonfly*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then case $host_cpu in i*86 ) # Not sure whether the presence of OpenBSD here was a mistake. # Let's accept both of them until this is cleared up. lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=$FILECMD + lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ;; esac @@ -9238,7 +9066,7 @@ haiku*) ;; hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=$FILECMD + lt_cv_file_magic_cmd=/usr/bin/file case $host_cpu in ia64*) lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' @@ -9285,7 +9113,7 @@ netbsd* | netbsdelf*-gnu) newos6*) lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=$FILECMD + lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_test_file=/usr/lib/libnls.so ;; @@ -9655,29 +9483,13 @@ esac fi : ${AR=ar} +: ${AR_FLAGS=cr} -# Use ARFLAGS variable as AR's operation code to sync the variable naming with -# Automake. If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have -# higher priority because thats what people were doing historically (setting -# ARFLAGS for automake and AR_FLAGS for libtool). FIXME: Make the AR_FLAGS -# variable obsoleted/removed. - -test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cr} -lt_ar_flags=$AR_FLAGS - - - - - - -# Make AR_FLAGS overridable by 'make ARFLAGS='. Don't try to run-time override -# by AR_FLAGS because that was never working and AR_FLAGS is about to die. - @@ -10093,7 +9905,7 @@ esac if test "$lt_cv_nm_interface" = "MS dumpbin"; then # Gets list of data symbols to import. - lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* \(.*\)$/\1/p'" + lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" # Adjust the below global symbol transforms to fixup imported variables. lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" @@ -10111,20 +9923,20 @@ fi # Transform an extracted symbol line into a proper C declaration. # Some systems (esp. on ia64) link data and code symbols differently, # so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="$SED -n"\ +lt_cv_sys_global_symbol_to_cdecl="sed -n"\ $lt_cdecl_hook\ " -e 's/^T .* \(.*\)$/extern int \1();/p'"\ " -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="$SED -n"\ +lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ $lt_c_name_hook\ " -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ " -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" # Transform an extracted symbol line into symbol name with lib prefix and # symbol address. -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="$SED -n"\ +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ $lt_c_name_lib_hook\ " -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ " -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ @@ -10148,7 +9960,7 @@ for ac_symprfx in "" "_"; do if test "$lt_cv_nm_interface" = "MS dumpbin"; then # Fake it for dumpbin and say T for any non-static function, # D for any global variable and I for any imported variable. - # Also find C++ and __fastcall symbols from MSVC++ or ICC, + # Also find C++ and __fastcall symbols from MSVC++, # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK '"\ " {last_section=section; section=\$ 3};"\ @@ -10166,9 +9978,9 @@ for ac_symprfx in "" "_"; do " s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ " ' prfx=^$ac_symprfx" else - lt_cv_sys_global_symbol_pipe="$SED -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi - lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | $SED '/ __gnu_lto/d'" + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" # Check to see that the pipe works correctly. pipe_works=no @@ -10368,7 +10180,7 @@ case $with_sysroot in #( fi ;; #( /*) - lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"` + lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` ;; #( no|'') ;; #( @@ -10493,7 +10305,7 @@ ia64-*-hpux*) ac_status=$? printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - case `$FILECMD conftest.$ac_objext` in + case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) HPUX_IA64_MODE=32 ;; @@ -10514,7 +10326,7 @@ ia64-*-hpux*) printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then if test yes = "$lt_cv_prog_gnu_ld"; then - case `$FILECMD conftest.$ac_objext` in + case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -melf32bsmip" ;; @@ -10526,7 +10338,7 @@ ia64-*-hpux*) ;; esac else - case `$FILECMD conftest.$ac_objext` in + case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" ;; @@ -10552,7 +10364,7 @@ mips64*-*linux*) printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then emul=elf - case `$FILECMD conftest.$ac_objext` in + case `/usr/bin/file conftest.$ac_objext` in *32-bit*) emul="${emul}32" ;; @@ -10560,7 +10372,7 @@ mips64*-*linux*) emul="${emul}64" ;; esac - case `$FILECMD conftest.$ac_objext` in + case `/usr/bin/file conftest.$ac_objext` in *MSB*) emul="${emul}btsmip" ;; @@ -10568,7 +10380,7 @@ mips64*-*linux*) emul="${emul}ltsmip" ;; esac - case `$FILECMD conftest.$ac_objext` in + case `/usr/bin/file conftest.$ac_objext` in *N32*) emul="${emul}n32" ;; @@ -10592,14 +10404,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) ac_status=$? printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - case `$FILECMD conftest.o` in + case `/usr/bin/file conftest.o` in *32-bit*) case $host in x86_64-*kfreebsd*-gnu) LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - case `$FILECMD conftest.o` in + case `/usr/bin/file conftest.o` in *x86-64*) LD="${LD-ld} -m elf32_x86_64" ;; @@ -10706,7 +10518,7 @@ printf "%s\n" "$lt_cv_cc_needs_belf" >&6; } ac_status=$? printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - case `$FILECMD conftest.o` in + case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in yes*) @@ -11488,8 +11300,8 @@ int forced_loaded() { return 2;} _LT_EOF echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR $AR_FLAGS libconftest.a conftest.o" >&5 - $AR $AR_FLAGS libconftest.a conftest.o 2>&5 + echo "$AR cr libconftest.a conftest.o" >&5 + $AR cr libconftest.a conftest.o 2>&5 echo "$RANLIB libconftest.a" >&5 $RANLIB libconftest.a 2>&5 cat > conftest.c << _LT_EOF @@ -11516,12 +11328,17 @@ printf "%s\n" "$lt_cv_ld_force_load" >&6; } _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; darwin1.*) _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - darwin*) - case $MACOSX_DEPLOYMENT_TARGET,$host in - 10.[012],*|,*powerpc*-darwin[5-8]*) - _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - *) - _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + darwin*) # darwin 5.x on + # if running on 10.5 or later, the deployment target defaults + # to the OS version, if on x86, and 10.4, the deployment + # target defaults to 10.4. Don't you love it? + case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in + 10.0,*86*-darwin8*|10.0,*-darwin[912]*) + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + 10.[012][,.]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; + 10.*|11.*) + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; esac @@ -12344,8 +12161,8 @@ esac ofile=libtool can_build_shared=yes -# All known linkers require a '.a' archive for static linking (except MSVC and -# ICC, which need '.lib'). +# All known linkers require a '.a' archive for static linking (except MSVC, +# which needs '.lib'). libext=a with_gnu_ld=$lt_cv_prog_gnu_ld @@ -12863,7 +12680,7 @@ lt_prog_compiler_static= lt_prog_compiler_static='-qstaticlink' ;; *) - case `$CC -V 2>&1 | $SED 5q` in + case `$CC -V 2>&1 | sed 5q` in *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker lt_prog_compiler_pic='-KPIC' @@ -13286,15 +13103,15 @@ printf %s "checking whether the $compiler linker ($LD) supports shared libraries case $host_os in cygwin* | mingw* | pw32* | cegcc*) - # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time + # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using - # Microsoft Visual C++ or Intel C++ Compiler. + # Microsoft Visual C++. if test yes != "$GCC"; then with_gnu_ld=no fi ;; interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC) + # we just hope/assume this is gcc and not c89 (= MSVC++) with_gnu_ld=yes ;; openbsd* | bitrig*) @@ -13349,7 +13166,7 @@ printf %s "checking whether the $compiler linker ($LD) supports shared libraries whole_archive_flag_spec= fi supports_anon_versioning=no - case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in + case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in *GNU\ gold*) supports_anon_versioning=yes ;; *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... @@ -13461,7 +13278,6 @@ _LT_EOF emximp -o $lib $output_objdir/$libname.def' old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' enable_shared_with_static_runtimes=yes - file_list_spec='@' ;; interix[3-9]*) @@ -13476,7 +13292,7 @@ _LT_EOF # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) @@ -13519,7 +13335,7 @@ _LT_EOF compiler_needs_object=yes ;; esac - case `$CC -V 2>&1 | $SED 5q` in + case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C 5.9 whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' compiler_needs_object=yes @@ -13531,14 +13347,13 @@ _LT_EOF if test yes = "$supports_anon_versioning"; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi case $cc_basename in tcc*) - hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' export_dynamic_flag_spec='-rdynamic' ;; xlf* | bgf* | bgxlf* | mpixlf*) @@ -13548,7 +13363,7 @@ _LT_EOF archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test yes = "$supports_anon_versioning"; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi @@ -13680,7 +13495,7 @@ _LT_EOF if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi aix_use_runtimelinking=no @@ -13949,12 +13764,12 @@ fi cygwin* | mingw* | pw32* | cegcc*) # When not using gcc, we currently assume that we are using - # Microsoft Visual C++ or Intel C++ Compiler. + # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. case $cc_basename in - cl* | icl*) - # Native MSVC or ICC + cl*) + # Native MSVC hardcode_libdir_flag_spec=' ' allow_undefined_flag=unsupported always_export_symbols=yes @@ -13995,7 +13810,7 @@ fi fi' ;; *) - # Assume MSVC and ICC wrapper + # Assume MSVC wrapper hardcode_libdir_flag_spec=' ' allow_undefined_flag=unsupported # Tell ltmain to make .lib files, not .a files. @@ -14036,8 +13851,8 @@ fi output_verbose_link_cmd=func_echo_all archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" - archive_expsym_cmds="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" - module_expsym_cmds="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" + archive_expsym_cmds="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" else ld_shlibs=no @@ -14071,7 +13886,7 @@ fi ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly* | midnightbsd*) + freebsd* | dragonfly*) archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes @@ -14252,7 +14067,6 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; } # Fabrice Bellard et al's Tiny C Compiler ld_shlibs=yes archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' ;; esac ;; @@ -14324,7 +14138,6 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; } emximp -o $lib $output_objdir/$libname.def' old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' enable_shared_with_static_runtimes=yes - file_list_spec='@' ;; osf3*) @@ -15017,7 +14830,7 @@ cygwin* | mingw* | pw32* | cegcc*) case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" ;; @@ -15027,14 +14840,14 @@ cygwin* | mingw* | pw32* | cegcc*) ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo $libname | $SED -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' ;; - *,cl* | *,icl*) - # Native MSVC or ICC + *,cl*) + # Native MSVC libname_spec='$name' soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' library_names_spec='$libname.dll.lib' @@ -15053,7 +14866,7 @@ cygwin* | mingw* | pw32* | cegcc*) done IFS=$lt_save_ifs # Convert to MSYS style. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` ;; cygwin*) # Convert to unix form, then to dos form, then back to unix form @@ -15090,7 +14903,7 @@ cygwin* | mingw* | pw32* | cegcc*) ;; *) - # Assume MSVC and ICC wrapper + # Assume MSVC wrapper library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; @@ -15123,7 +14936,7 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; -freebsd* | dragonfly* | midnightbsd*) +freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. if test -x /usr/bin/objformat; then @@ -16287,41 +16100,30 @@ striplib= old_striplib= { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 printf %s "checking whether stripping libraries is possible... " >&6; } -if test -z "$STRIP"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -else - if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then - old_striplib="$STRIP --strip-debug" - striplib="$STRIP --strip-unneeded" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - else - case $host_os in - darwin*) - # FIXME - insert some real tests, host_os isn't really good enough +else +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) + if test -n "$STRIP"; then striplib="$STRIP -x" old_striplib="$STRIP -S" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - ;; - freebsd*) - if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then - old_striplib="$STRIP --strip-debug" - striplib="$STRIP --strip-unneeded" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - fi - ;; - *) + else { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - ;; - esac - fi + fi + ;; + *) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + ;; + esac fi @@ -17799,6 +17601,120 @@ printf "%s\n" "yes" >&6; } printf "%s\n" "no" >&6; } fi + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if compiler is Watcom C" >&5 +printf %s "checking if compiler is Watcom C... " >&6; } + + OLDCPPFLAGS=$CPPFLAGS + # CPPPFLAG comes from CURL_CPP_P + CPPFLAGS="$CPPFLAGS $CPPPFLAG" + if test -z "$SED"; then + as_fn_error $? "SED not set. Cannot continue without SED being set." "$LINENO" 5 + fi + if test -z "$GREP"; then + as_fn_error $? "GREP not set. Cannot continue without GREP being set." "$LINENO" 5 + fi + + tmp_exp="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +#ifdef __WATCOMC__ +CURL_DEF_TOKEN __WATCOMC__ +#endif + + +_ACEOF +if ac_fn_c_try_cpp "$LINENO" +then : + + tmp_exp=`eval "$ac_cpp conftest.$ac_ext" 2>/dev/null | \ + "$GREP" CURL_DEF_TOKEN 2>/dev/null | \ + "$SED" 's/.*CURL_DEF_TOKEN[ ][ ]*//' 2>/dev/null | \ + "$SED" 's/["][ ]*["]//g' 2>/dev/null` + if test -z "$tmp_exp" || test "$tmp_exp" = "__WATCOMC__"; then + tmp_exp="" + fi + +fi +rm -f conftest.err conftest.i conftest.$ac_ext + if test -z "$tmp_exp"; then + curl_cv_have_def___WATCOMC__=no + + else + curl_cv_have_def___WATCOMC__=yes + curl_cv_def___WATCOMC__=$tmp_exp + + fi + CPPFLAGS=$OLDCPPFLAGS + + if test "$curl_cv_have_def___WATCOMC__" = "yes"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + + OLDCPPFLAGS=$CPPFLAGS + # CPPPFLAG comes from CURL_CPP_P + CPPFLAGS="$CPPFLAGS $CPPPFLAG" + if test -z "$SED"; then + as_fn_error $? "SED not set. Cannot continue without SED being set." "$LINENO" 5 + fi + if test -z "$GREP"; then + as_fn_error $? "GREP not set. Cannot continue without GREP being set." "$LINENO" 5 + fi + + tmp_exp="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +#ifdef __UNIX__ +CURL_DEF_TOKEN __UNIX__ +#endif + + +_ACEOF +if ac_fn_c_try_cpp "$LINENO" +then : + + tmp_exp=`eval "$ac_cpp conftest.$ac_ext" 2>/dev/null | \ + "$GREP" CURL_DEF_TOKEN 2>/dev/null | \ + "$SED" 's/.*CURL_DEF_TOKEN[ ][ ]*//' 2>/dev/null | \ + "$SED" 's/["][ ]*["]//g' 2>/dev/null` + if test -z "$tmp_exp" || test "$tmp_exp" = "__UNIX__"; then + tmp_exp="" + fi + +fi +rm -f conftest.err conftest.i conftest.$ac_ext + if test -z "$tmp_exp"; then + curl_cv_have_def___UNIX__=no + + else + curl_cv_have_def___UNIX__=yes + curl_cv_def___UNIX__=$tmp_exp + + fi + CPPFLAGS=$OLDCPPFLAGS + + if test "$curl_cv_have_def___UNIX__" = "yes"; then + compiler_id="WATCOM_UNIX_C" + flags_dbg_yes="-g2" + flags_opt_all="-O0 -O1 -O2 -O3" + flags_opt_yes="-O2" + flags_opt_off="-O0" + else + compiler_id="WATCOM_WINDOWS_C" + flags_dbg_yes="" + flags_opt_all="" + flags_opt_yes="" + flags_opt_off="" + fi + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + fi + # if test "$compiler_id" = "unknown"; then cat <<_EOF 1>&2 @@ -17845,7 +17761,6 @@ squeeze() { CLANG) # tmp_CFLAGS="$tmp_CFLAGS -Qunused-arguments" - tmp_CFLAGS="$tmp_CFLAGS -Wno-pointer-bool-conversion" ;; # DEC_C) @@ -17913,6 +17828,16 @@ squeeze() { tmp_CFLAGS="$tmp_CFLAGS" ;; # + WATCOM_UNIX_C) + # + tmp_CFLAGS="$tmp_CFLAGS" + ;; + # + WATCOM_WINDOWS_C) + # + tmp_CFLAGS="$tmp_CFLAGS" + ;; + # esac # squeeze tmp_CPPFLAGS @@ -17993,55 +17918,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ if test "x$cross_compiling" != "xyes" && test "$tmp_compiler_works" = "yes"; then - case $host_os in - darwin*) - if test "$cross_compiling" = yes -then : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run test program while cross compiling -See \`config.log' for more details" "$LINENO" 5; } -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - -# ifdef __STDC__ -# include -# endif - -int main (void) -{ - - int i = 0; - exit(i); - - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_run "$LINENO" -then : - tmp_compiler_works="yes" - -else $as_nop - tmp_compiler_works="no" - echo " " >&6 - echo "run-fail: test program exited with status $ac_status" >&6 - echo " " >&6 - -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - ;; - *) - old=$LD_LIBRARY_PATH - LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old - export LD_LIBRARY_PATH - if test "$cross_compiling" = yes + old=$LD_LIBRARY_PATH + LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old + export LD_LIBRARY_PATH + if test "$cross_compiling" = yes then : { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} @@ -18082,9 +17962,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi - LD_LIBRARY_PATH=$old # restore - ;; - esac + LD_LIBRARY_PATH=$old # restore fi if test "$tmp_compiler_works" = "yes"; then @@ -18322,55 +18200,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ if test "x$cross_compiling" != "xyes" && test "$tmp_compiler_works" = "yes"; then - case $host_os in - darwin*) - if test "$cross_compiling" = yes -then : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run test program while cross compiling -See \`config.log' for more details" "$LINENO" 5; } -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - -# ifdef __STDC__ -# include -# endif - -int main (void) -{ - - int i = 0; - exit(i); - - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_run "$LINENO" -then : - tmp_compiler_works="yes" - -else $as_nop - tmp_compiler_works="no" - echo " " >&6 - echo "run-fail: test program exited with status $ac_status" >&6 - echo " " >&6 - -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - ;; - *) - old=$LD_LIBRARY_PATH - LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old - export LD_LIBRARY_PATH - if test "$cross_compiling" = yes + old=$LD_LIBRARY_PATH + LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old + export LD_LIBRARY_PATH + if test "$cross_compiling" = yes then : { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} @@ -18411,9 +18244,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi - LD_LIBRARY_PATH=$old # restore - ;; - esac + LD_LIBRARY_PATH=$old # restore fi if test "$tmp_compiler_works" = "yes"; then @@ -19544,27 +19375,22 @@ printf "%s\n" "$as_me: WARNING: compiler options rejected: $tmp_options" >&2;} fi fi # - if test "$compiler_num" -ge "1000"; then - - ac_var_added_warnings="" - for warning in arith-conversion; do - - ac_var_match_word="no" - for word1 in $CFLAGS; do - for word2 in -Wno-$warning -W$warning; do - if test "$word1" = "$word2"; then - ac_var_match_word="yes" - fi - done - done - - if test "$ac_var_match_word" = "no"; then - ac_var_added_warnings="$ac_var_added_warnings -W$warning" - fi - done - tmp_CFLAGS="$tmp_CFLAGS $ac_var_added_warnings" - squeeze tmp_CFLAGS - + fi + # + if test "$compiler_num" -ge "300"; then + tmp_CFLAGS="$tmp_CFLAGS -Wno-system-headers" + else + if test "x$cross_compiling" = "xyes"; then + if test "$compiler_num" -ge "104"; then + tmp_CFLAGS="$tmp_CFLAGS -Wno-unused -Wno-shadow" + fi + if test "$compiler_num" -ge "207"; then + tmp_CFLAGS="$tmp_CFLAGS -Wno-missing-declarations" + tmp_CFLAGS="$tmp_CFLAGS -Wno-missing-prototypes" + fi + fi + fi + if test "$compiler_num" -ge "1000"; then ac_var_added_warnings="" for warning in enum-conversion; do @@ -19585,22 +19411,6 @@ printf "%s\n" "$as_me: WARNING: compiler options rejected: $tmp_options" >&2;} tmp_CFLAGS="$tmp_CFLAGS $ac_var_added_warnings" squeeze tmp_CFLAGS - fi - # - fi - # - if test "$compiler_num" -ge "300"; then - tmp_CFLAGS="$tmp_CFLAGS -Wno-system-headers" - else - if test "x$cross_compiling" = "xyes"; then - if test "$compiler_num" -ge "104"; then - tmp_CFLAGS="$tmp_CFLAGS -Wno-unused -Wno-shadow" - fi - if test "$compiler_num" -ge "207"; then - tmp_CFLAGS="$tmp_CFLAGS -Wno-missing-declarations" - tmp_CFLAGS="$tmp_CFLAGS -Wno-missing-prototypes" - fi - fi fi ;; # @@ -19738,6 +19548,18 @@ printf "%s\n" "$as_me: WARNING: compiler options rejected: $tmp_options" >&2;} fi ;; # + WATCOM_UNIX_C) + # + if test "$want_warnings" = "yes"; then + tmp_CFLAGS="$tmp_CFLAGS -Wall -Wextra" + fi + ;; + # + WATCOM_WINDOWS_C) + # + tmp_CFLAGS="$tmp_CFLAGS" + ;; + # esac # squeeze tmp_CPPFLAGS @@ -19818,55 +19640,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ if test "x$cross_compiling" != "xyes" && test "$tmp_compiler_works" = "yes"; then - case $host_os in - darwin*) - if test "$cross_compiling" = yes -then : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run test program while cross compiling -See \`config.log' for more details" "$LINENO" 5; } -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - -# ifdef __STDC__ -# include -# endif - -int main (void) -{ - - int i = 0; - exit(i); - - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_run "$LINENO" -then : - tmp_compiler_works="yes" - -else $as_nop - tmp_compiler_works="no" - echo " " >&6 - echo "run-fail: test program exited with status $ac_status" >&6 - echo " " >&6 - -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - ;; - *) - old=$LD_LIBRARY_PATH - LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old - export LD_LIBRARY_PATH - if test "$cross_compiling" = yes + old=$LD_LIBRARY_PATH + LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old + export LD_LIBRARY_PATH + if test "$cross_compiling" = yes then : { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} @@ -19907,9 +19684,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi - LD_LIBRARY_PATH=$old # restore - ;; - esac + LD_LIBRARY_PATH=$old # restore fi if test "$tmp_compiler_works" = "yes"; then @@ -21395,7 +21170,7 @@ printf "%s\n" "found" >&6; } LIB_HYPER="-lhyper -ldl -lpthread -lm" if test X"$want_hyper" != Xdefault; then CPP_HYPER=-I"$want_hyper_path/capi/include" - LD_HYPER="-L$want_hyper_path/target/release -L$want_hyper_path/target/debug" + LD_HYPER="-L$want_hyper_path/target/debug" fi fi if test -n "$LIB_HYPER"; then @@ -21411,7 +21186,7 @@ printf "%s\n" "$as_me: -L is $LD_HYPER" >&6;} LIBS="$LIB_HYPER $LIBS" if test "x$cross_compiling" != "xyes"; then - DIR_HYPER=`echo $LD_HYPER | $SED -e 's/^-L//' -e 's/ -L/:/g'` + DIR_HYPER=`echo $LD_HYPER | $SED -e 's/^-L//'` fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for hyper_io_new in -lhyper" >&5 @@ -21478,12 +21253,7 @@ fi done else $as_nop - for d in `echo $DIR_HYPER | $SED -e 's/:/ /'`; do - if test -f "$d/libhyper.a"; then - as_fn_error $? "hyper was found in $d but was probably built with wrong flags. See docs/HYPER.md." "$LINENO" 5 - fi - done - as_fn_error $? "--with-hyper but hyper was not found. See docs/HYPER.md." "$LINENO" 5 + as_fn_error $? "--with-hyper but hyper was not found. See docs/HYPER.md." "$LINENO" 5 fi @@ -22313,6 +22083,53 @@ fi fi +if test "$HAVE_GETHOSTBYNAME" != "1" +then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnet" >&5 +printf %s "checking for gethostbyname in -lnet... " >&6; } +if test ${ac_cv_lib_net_gethostbyname+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_check_lib_save_LIBS=$LIBS +LIBS="-lnet $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +#ifdef __cplusplus +extern "C" +#endif +char gethostbyname (); +int main (void) +{ +return gethostbyname (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_net_gethostbyname=yes +else $as_nop + ac_cv_lib_net_gethostbyname=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_net_gethostbyname" >&5 +printf "%s\n" "$ac_cv_lib_net_gethostbyname" >&6; } +if test "x$ac_cv_lib_net_gethostbyname" = xyes +then : + HAVE_GETHOSTBYNAME="1" + LIBS="-lnet $LIBS" + +fi + +fi + + if test "$HAVE_GETHOSTBYNAME" != "1"; then as_fn_error $? "couldn't find libraries for gethostbyname()" "$LINENO" 5 fi @@ -22661,9 +22478,10 @@ printf "%s\n" "$curl_cv_gclk_LIBS" >&6; } { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if monotonic clock_gettime works" >&5 printf %s "checking if monotonic clock_gettime works... " >&6; } - case $host_os in - darwin*) - if test "$cross_compiling" = yes + old=$LD_LIBRARY_PATH + LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old + export LD_LIBRARY_PATH + if test "$cross_compiling" = yes then : { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} @@ -22717,68 +22535,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi - ;; - *) - old=$LD_LIBRARY_PATH - LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old - export LD_LIBRARY_PATH - if test "$cross_compiling" = yes -then : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run test program while cross compiling -See \`config.log' for more details" "$LINENO" 5; } -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - -#ifdef HAVE_STDLIB_H -#include -#endif -#ifdef HAVE_SYS_TYPES_H -#include -#endif -#ifdef HAVE_SYS_TIME_H -#include -#endif -#include - -int main (void) -{ - - struct timespec ts; - if (0 == clock_gettime(CLOCK_MONOTONIC, &ts)) - exit(0); - else - exit(1); - - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_run "$LINENO" -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: HAVE_CLOCK_GETTIME_MONOTONIC will not be defined" >&5 -printf "%s\n" "$as_me: WARNING: HAVE_CLOCK_GETTIME_MONOTONIC will not be defined" >&2;} - curl_func_clock_gettime="no" - LIBS="$curl_cv_save_LIBS" - -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - LD_LIBRARY_PATH=$old # restore - ;; - esac + LD_LIBRARY_PATH=$old # restore fi # @@ -24425,9 +24182,10 @@ fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if argv can be written to" >&5 printf %s "checking if argv can be written to... " >&6; } - case $host_os in - darwin*) - if test "$cross_compiling" = yes + old=$LD_LIBRARY_PATH + LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old + export LD_LIBRARY_PATH + if test "$cross_compiling" = yes then : curl_cv_writable_argv=cross @@ -24455,42 +24213,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi - ;; - *) - old=$LD_LIBRARY_PATH - LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old - export LD_LIBRARY_PATH - if test "$cross_compiling" = yes -then : - curl_cv_writable_argv=cross - -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int main(int argc, char **argv) -{ - (void)argc; - argv[0][0] = ' '; - return (argv[0][0] == ' ')?0:1; -} - -_ACEOF -if ac_fn_c_try_run "$LINENO" -then : - curl_cv_writable_argv=yes - -else $as_nop - curl_cv_writable_argv=no - -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - LD_LIBRARY_PATH=$old # restore - ;; - esac + LD_LIBRARY_PATH=$old # restore case $curl_cv_writable_argv in yes) @@ -24551,8 +24274,6 @@ then : fi -: ${KRB5CONFIG:="$GSSAPI_ROOT/bin/krb5-config"} - save_CPPFLAGS="$CPPFLAGS" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if GSS-API support is requested" >&5 printf %s "checking if GSS-API support is requested... " >&6; } @@ -24560,144 +24281,6 @@ if test x"$want_gss" = xyes; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - if test $GSSAPI_ROOT != "/usr"; then - - if test -n "$PKG_CONFIG"; then - PKGCONFIG="$PKG_CONFIG" - else - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. -set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_PKGCONFIG+y} -then : - printf %s "(cached) " >&6 -else $as_nop - case $PKGCONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKGCONFIG="$PKGCONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -as_dummy="$PATH:/usr/bin:/usr/local/bin" -for as_dir in $as_dummy -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_PKGCONFIG="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -PKGCONFIG=$ac_cv_path_PKGCONFIG -if test -n "$PKGCONFIG"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKGCONFIG" >&5 -printf "%s\n" "$PKGCONFIG" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - -fi -if test -z "$ac_cv_path_PKGCONFIG"; then - ac_pt_PKGCONFIG=$PKGCONFIG - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_ac_pt_PKGCONFIG+y} -then : - printf %s "(cached) " >&6 -else $as_nop - case $ac_pt_PKGCONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_ac_pt_PKGCONFIG="$ac_pt_PKGCONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -as_dummy="$PATH:/usr/bin:/usr/local/bin" -for as_dir in $as_dummy -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_ac_pt_PKGCONFIG="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -ac_pt_PKGCONFIG=$ac_cv_path_ac_pt_PKGCONFIG -if test -n "$ac_pt_PKGCONFIG"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKGCONFIG" >&5 -printf "%s\n" "$ac_pt_PKGCONFIG" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - if test "x$ac_pt_PKGCONFIG" = x; then - PKGCONFIG="no" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - PKGCONFIG=$ac_pt_PKGCONFIG - fi -else - PKGCONFIG="$ac_cv_path_PKGCONFIG" -fi - - fi - - if test "x$PKGCONFIG" != "xno"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mit-krb5-gssapi options with pkg-config" >&5 -printf %s "checking for mit-krb5-gssapi options with pkg-config... " >&6; } - itexists=` - if test -n "$GSSAPI_ROOT/lib/pkgconfig"; then - PKG_CONFIG_LIBDIR="$GSSAPI_ROOT/lib/pkgconfig" - export PKG_CONFIG_LIBDIR - fi - $PKGCONFIG --exists mit-krb5-gssapi >/dev/null 2>&1 && echo 1` - - if test -z "$itexists"; then - PKGCONFIG="no" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found" >&5 -printf "%s\n" "found" >&6; } - fi - fi - - else if test -n "$PKG_CONFIG"; then PKGCONFIG="$PKG_CONFIG" @@ -24834,14 +24417,11 @@ printf "%s\n" "found" >&6; } fi fi - fi if test -z "$GSSAPI_INCS"; then if test -n "$host_alias" -a -f "$GSSAPI_ROOT/bin/$host_alias-krb5-config"; then GSSAPI_INCS=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --cflags gssapi` elif test "$PKGCONFIG" != "no" ; then GSSAPI_INCS=`$PKGCONFIG --cflags mit-krb5-gssapi` - elif test -f "$KRB5CONFIG"; then - GSSAPI_INCS=`$KRB5CONFIG --cflags gssapi` elif test "$GSSAPI_ROOT" != "yes"; then GSSAPI_INCS="-I$GSSAPI_ROOT/include" fi @@ -24981,144 +24561,6 @@ printf "%s\n" "#define HAVE_GSSAPI 1" >>confdefs.h LIBS="-lgssapi_krb5 -lresolv $LIBS" ;; *) - if test $GSSAPI_ROOT != "/usr"; then - - if test -n "$PKG_CONFIG"; then - PKGCONFIG="$PKG_CONFIG" - else - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. -set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_PKGCONFIG+y} -then : - printf %s "(cached) " >&6 -else $as_nop - case $PKGCONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKGCONFIG="$PKGCONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -as_dummy="$PATH:/usr/bin:/usr/local/bin" -for as_dir in $as_dummy -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_PKGCONFIG="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -PKGCONFIG=$ac_cv_path_PKGCONFIG -if test -n "$PKGCONFIG"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKGCONFIG" >&5 -printf "%s\n" "$PKGCONFIG" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - -fi -if test -z "$ac_cv_path_PKGCONFIG"; then - ac_pt_PKGCONFIG=$PKGCONFIG - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_path_ac_pt_PKGCONFIG+y} -then : - printf %s "(cached) " >&6 -else $as_nop - case $ac_pt_PKGCONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_ac_pt_PKGCONFIG="$ac_pt_PKGCONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -as_dummy="$PATH:/usr/bin:/usr/local/bin" -for as_dir in $as_dummy -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_path_ac_pt_PKGCONFIG="$as_dir$ac_word$ac_exec_ext" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -ac_pt_PKGCONFIG=$ac_cv_path_ac_pt_PKGCONFIG -if test -n "$ac_pt_PKGCONFIG"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKGCONFIG" >&5 -printf "%s\n" "$ac_pt_PKGCONFIG" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - if test "x$ac_pt_PKGCONFIG" = x; then - PKGCONFIG="no" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - PKGCONFIG=$ac_pt_PKGCONFIG - fi -else - PKGCONFIG="$ac_cv_path_PKGCONFIG" -fi - - fi - - if test "x$PKGCONFIG" != "xno"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mit-krb5-gssapi options with pkg-config" >&5 -printf %s "checking for mit-krb5-gssapi options with pkg-config... " >&6; } - itexists=` - if test -n "$GSSAPI_ROOT/lib/pkgconfig"; then - PKG_CONFIG_LIBDIR="$GSSAPI_ROOT/lib/pkgconfig" - export PKG_CONFIG_LIBDIR - fi - $PKGCONFIG --exists mit-krb5-gssapi >/dev/null 2>&1 && echo 1` - - if test -z "$itexists"; then - PKGCONFIG="no" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found" >&5 -printf "%s\n" "found" >&6; } - fi - fi - - else if test -n "$PKG_CONFIG"; then PKGCONFIG="$PKG_CONFIG" @@ -25255,16 +24697,12 @@ printf "%s\n" "found" >&6; } fi fi - fi if test -n "$host_alias" -a -f "$GSSAPI_ROOT/bin/$host_alias-krb5-config"; then gss_libs=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --libs gssapi` LIBS="$gss_libs $LIBS" elif test "$PKGCONFIG" != "no" ; then gss_libs=`$PKGCONFIG --libs mit-krb5-gssapi` LIBS="$gss_libs $LIBS" - elif test -f "$KRB5CONFIG"; then - gss_libs=`$KRB5CONFIG --libs gssapi` - LIBS="$gss_libs $LIBS" else case $host in *-hp-hpux*) @@ -25299,53 +24737,6 @@ else CPPFLAGS="$save_CPPFLAGS" fi -if test x"$want_gss" = xyes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can link against GSS-API library" >&5 -printf %s "checking if we can link against GSS-API library... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - -#define gss_init_sec_context innocuous_gss_init_sec_context -#ifdef __STDC__ -# include -#else -# include -#endif -#undef gss_init_sec_context -#ifdef __cplusplus -extern "C" -#endif -char gss_init_sec_context (); -#if defined __stub_gss_init_sec_context || defined __stub___gss_init_sec_context -choke me -#endif - -int main (void) -{ -return gss_init_sec_context (); - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - -else $as_nop - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - as_fn_error $? "--with-gssapi was specified, but a GSS-API library was not found." "$LINENO" 5 - -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext -fi - build_libstubgss=no if test x"$want_gss" = "xyes"; then build_libstubgss=yes @@ -26105,6 +25496,18 @@ if test "x$ac_cv_func_RAND_egd" = xyes then : printf "%s\n" "#define HAVE_RAND_EGD 1" >>confdefs.h +fi +ac_fn_c_check_func "$LINENO" "SSLv2_client_method" "ac_cv_func_SSLv2_client_method" +if test "x$ac_cv_func_SSLv2_client_method" = xyes +then : + printf "%s\n" "#define HAVE_SSLV2_CLIENT_METHOD 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "OpenSSL_version" "ac_cv_func_OpenSSL_version" +if test "x$ac_cv_func_OpenSSL_version" = xyes +then : + printf "%s\n" "#define HAVE_OPENSSL_VERSION 1" >>confdefs.h + fi @@ -26233,6 +25636,778 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext printf "%s\n" "$as_me: Added $LIB_OPENSSL to CURL_LIBRARY_PATH" >&6;} fi fi + + # + + # + tst_api="unknown" + # + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for OpenSSL headers version" >&5 +printf %s "checking for OpenSSL headers version... " >&6; } + + OLDCPPFLAGS=$CPPFLAGS + # CPPPFLAG comes from CURL_CPP_P + CPPFLAGS="$CPPFLAGS $CPPPFLAG" + if test -z "$SED"; then + as_fn_error $? "SED not set. Cannot continue without SED being set." "$LINENO" 5 + fi + if test -z "$GREP"; then + as_fn_error $? "GREP not set. Cannot continue without GREP being set." "$LINENO" 5 + fi + + tmp_exp="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +# ifdef USE_OPENSSL +# include +# else +# include +# endif + +#ifdef OPENSSL_VERSION_NUMBER +CURL_DEF_TOKEN OPENSSL_VERSION_NUMBER +#endif + + +_ACEOF +if ac_fn_c_try_cpp "$LINENO" +then : + + tmp_exp=`eval "$ac_cpp conftest.$ac_ext" 2>/dev/null | \ + "$GREP" CURL_DEF_TOKEN 2>/dev/null | \ + "$SED" 's/.*CURL_DEF_TOKEN[ ][ ]*//' 2>/dev/null | \ + "$SED" 's/["][ ]*["]//g' 2>/dev/null` + if test -z "$tmp_exp" || test "$tmp_exp" = "OPENSSL_VERSION_NUMBER"; then + tmp_exp="" + fi + +fi +rm -f conftest.err conftest.i conftest.$ac_ext + if test -z "$tmp_exp"; then + curl_cv_have_def_OPENSSL_VERSION_NUMBER=no + + else + curl_cv_have_def_OPENSSL_VERSION_NUMBER=yes + curl_cv_def_OPENSSL_VERSION_NUMBER=$tmp_exp + + fi + CPPFLAGS=$OLDCPPFLAGS + + + OLDCPPFLAGS=$CPPFLAGS + # CPPPFLAG comes from CURL_CPP_P + CPPFLAGS="$CPPFLAGS $CPPPFLAG" + if test -z "$SED"; then + as_fn_error $? "SED not set. Cannot continue without SED being set." "$LINENO" 5 + fi + if test -z "$GREP"; then + as_fn_error $? "GREP not set. Cannot continue without GREP being set." "$LINENO" 5 + fi + + tmp_exp="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +# include + +#ifdef OPENSSL_VERSION_STR +CURL_DEF_TOKEN OPENSSL_VERSION_STR +#endif + + +_ACEOF +if ac_fn_c_try_cpp "$LINENO" +then : + + tmp_exp=`eval "$ac_cpp conftest.$ac_ext" 2>/dev/null | \ + "$GREP" CURL_DEF_TOKEN 2>/dev/null | \ + "$SED" 's/.*CURL_DEF_TOKEN[ ][ ]*//' 2>/dev/null | \ + "$SED" 's/["][ ]*["]//g' 2>/dev/null` + if test -z "$tmp_exp" || test "$tmp_exp" = "OPENSSL_VERSION_STR"; then + tmp_exp="" + fi + +fi +rm -f conftest.err conftest.i conftest.$ac_ext + if test -z "$tmp_exp"; then + curl_cv_have_def_OPENSSL_VERSION_STR=no + + else + curl_cv_have_def_OPENSSL_VERSION_STR=yes + curl_cv_def_OPENSSL_VERSION_STR=$tmp_exp + + fi + CPPFLAGS=$OLDCPPFLAGS + + if test "$curl_cv_have_def_OPENSSL_VERSION_NUMBER" = "yes"; then + tst_verlen=`expr "$curl_cv_def_OPENSSL_VERSION_NUMBER" : '.*'` + case "x$tst_verlen" in + x6) + tst_vermaj=`echo $curl_cv_def_OPENSSL_VERSION_NUMBER | cut -c 3` + tst_vermin=`echo $curl_cv_def_OPENSSL_VERSION_NUMBER | cut -c 4` + tst_verfix=`echo $curl_cv_def_OPENSSL_VERSION_NUMBER | cut -c 5` + tst_api=0x$tst_vermaj$tst_vermin$tst_verfix + ;; + x11|x10) + tst_vermaj=`echo $curl_cv_def_OPENSSL_VERSION_NUMBER | cut -c 3` + tst_vermin=`echo $curl_cv_def_OPENSSL_VERSION_NUMBER | cut -c 5` + tst_verfix=`echo $curl_cv_def_OPENSSL_VERSION_NUMBER | cut -c 7` + tst_api=0x$tst_vermaj$tst_vermin$tst_verfix + ;; + *) + if test "$curl_cv_have_def_OPENSSL_VERSION_STR" = "yes"; then + ver=`echo $curl_cv_def_OPENSSL_VERSION_STR | sed 's/"//g'`; + tst_vermaj=`echo $ver | cut -d. -f1` + tst_vermin=`echo $ver | cut -d. -f2` + tst_verfix=`echo $ver | cut -d. -f3` + tst_show="$ver" + tst_api=0x$tst_vermaj$tst_vermin$tst_verfix + else + tst_api="unknown" + fi + ;; + esac + case $tst_api in + 0x111) tst_show="1.1.1" ;; + 0x110) tst_show="1.1.0" ;; + 0x102) tst_show="1.0.2" ;; + 0x101) tst_show="1.0.1" ;; + 0x100) tst_show="1.0.0" ;; + 0x099) tst_show="0.9.9" ;; + 0x098) tst_show="0.9.8" ;; + 0x097) tst_show="0.9.7" ;; + 0x096) tst_show="0.9.6" ;; + 0x095) tst_show="0.9.5" ;; + 0x094) tst_show="0.9.4" ;; + 0x093) tst_show="0.9.3" ;; + 0x092) tst_show="0.9.2" ;; + 0x091) tst_show="0.9.1" ;; + *) + if test -z "$tst_show"; then + tst_show="unknown" + fi + ;; + esac + tst_show="$tst_show - $tst_api" + else + tst_show="unknown" + fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $tst_show" >&5 +printf "%s\n" "$tst_show" >&6; } + # + curl_openssl_api_headers=$tst_api + + + # + tst_api="unknown" + # + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for OpenSSL library version" >&5 +printf %s "checking for OpenSSL library version... " >&6; } + if test "$tst_api" = "unknown"; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +#define SSL_CTX_load_verify_dir innocuous_SSL_CTX_load_verify_dir +#ifdef __STDC__ +# include +#else +# include +#endif +#undef SSL_CTX_load_verify_dir +#ifdef __cplusplus +extern "C" +#endif +char SSL_CTX_load_verify_dir (); +#if defined __stub_SSL_CTX_load_verify_dir || defined __stub___SSL_CTX_load_verify_dir +choke me +#endif + +int main (void) +{ +return SSL_CTX_load_verify_dir (); + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + + tst_api="0x300" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + fi + if test "$tst_api" = "unknown"; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +#define ERR_clear_last_mark innocuous_ERR_clear_last_mark +#ifdef __STDC__ +# include +#else +# include +#endif +#undef ERR_clear_last_mark +#ifdef __cplusplus +extern "C" +#endif +char ERR_clear_last_mark (); +#if defined __stub_ERR_clear_last_mark || defined __stub___ERR_clear_last_mark +choke me +#endif + +int main (void) +{ +return ERR_clear_last_mark (); + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + + tst_api="0x111" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + fi + if test "$tst_api" = "unknown"; then + case $host in + *-*-vms*) + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +#define SSL_CTX_set_not_resumbl_sess_cb innocuous_SSL_CTX_set_not_resumbl_sess_cb +#ifdef __STDC__ +# include +#else +# include +#endif +#undef SSL_CTX_set_not_resumbl_sess_cb +#ifdef __cplusplus +extern "C" +#endif +char SSL_CTX_set_not_resumbl_sess_cb (); +#if defined __stub_SSL_CTX_set_not_resumbl_sess_cb || defined __stub___SSL_CTX_set_not_resumbl_sess_cb +choke me +#endif + +int main (void) +{ +return SSL_CTX_set_not_resumbl_sess_cb (); + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + + tst_api="0x110" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + ;; + *) + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +#define SSL_CTX_set_not_resumable_session_callback innocuous_SSL_CTX_set_not_resumable_session_callback +#ifdef __STDC__ +# include +#else +# include +#endif +#undef SSL_CTX_set_not_resumable_session_callback +#ifdef __cplusplus +extern "C" +#endif +char SSL_CTX_set_not_resumable_session_callback (); +#if defined __stub_SSL_CTX_set_not_resumable_session_callback || defined __stub___SSL_CTX_set_not_resumable_session_callback +choke me +#endif + +int main (void) +{ +return SSL_CTX_set_not_resumable_session_callback (); + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + + tst_api="0x110" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + ;; + esac + fi + if test "$tst_api" = "unknown"; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +#define SSL_CONF_CTX_new innocuous_SSL_CONF_CTX_new +#ifdef __STDC__ +# include +#else +# include +#endif +#undef SSL_CONF_CTX_new +#ifdef __cplusplus +extern "C" +#endif +char SSL_CONF_CTX_new (); +#if defined __stub_SSL_CONF_CTX_new || defined __stub___SSL_CONF_CTX_new +choke me +#endif + +int main (void) +{ +return SSL_CONF_CTX_new (); + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + + tst_api="0x102" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + fi + if test "$tst_api" = "unknown"; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +#define SSL_renegotiate_abbreviated innocuous_SSL_renegotiate_abbreviated +#ifdef __STDC__ +# include +#else +# include +#endif +#undef SSL_renegotiate_abbreviated +#ifdef __cplusplus +extern "C" +#endif +char SSL_renegotiate_abbreviated (); +#if defined __stub_SSL_renegotiate_abbreviated || defined __stub___SSL_renegotiate_abbreviated +choke me +#endif + +int main (void) +{ +return SSL_renegotiate_abbreviated (); + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + + tst_api="0x101" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + fi + if test "$tst_api" = "unknown"; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +#define OBJ_add_sigid innocuous_OBJ_add_sigid +#ifdef __STDC__ +# include +#else +# include +#endif +#undef OBJ_add_sigid +#ifdef __cplusplus +extern "C" +#endif +char OBJ_add_sigid (); +#if defined __stub_OBJ_add_sigid || defined __stub___OBJ_add_sigid +choke me +#endif + +int main (void) +{ +return OBJ_add_sigid (); + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + + tst_api="0x100" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + fi + if test "$tst_api" = "unknown"; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +#define ERR_set_mark innocuous_ERR_set_mark +#ifdef __STDC__ +# include +#else +# include +#endif +#undef ERR_set_mark +#ifdef __cplusplus +extern "C" +#endif +char ERR_set_mark (); +#if defined __stub_ERR_set_mark || defined __stub___ERR_set_mark +choke me +#endif + +int main (void) +{ +return ERR_set_mark (); + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + + tst_api="0x098" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + fi + if test "$tst_api" = "unknown"; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +#define ERR_peek_last_error innocuous_ERR_peek_last_error +#ifdef __STDC__ +# include +#else +# include +#endif +#undef ERR_peek_last_error +#ifdef __cplusplus +extern "C" +#endif +char ERR_peek_last_error (); +#if defined __stub_ERR_peek_last_error || defined __stub___ERR_peek_last_error +choke me +#endif + +int main (void) +{ +return ERR_peek_last_error (); + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + + tst_api="0x097" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + fi + if test "$tst_api" = "unknown"; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +#define c2i_ASN1_OBJECT innocuous_c2i_ASN1_OBJECT +#ifdef __STDC__ +# include +#else +# include +#endif +#undef c2i_ASN1_OBJECT +#ifdef __cplusplus +extern "C" +#endif +char c2i_ASN1_OBJECT (); +#if defined __stub_c2i_ASN1_OBJECT || defined __stub___c2i_ASN1_OBJECT +choke me +#endif + +int main (void) +{ +return c2i_ASN1_OBJECT (); + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + + tst_api="0x096" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + fi + if test "$tst_api" = "unknown"; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +#define SSL_CTX_set_purpose innocuous_SSL_CTX_set_purpose +#ifdef __STDC__ +# include +#else +# include +#endif +#undef SSL_CTX_set_purpose +#ifdef __cplusplus +extern "C" +#endif +char SSL_CTX_set_purpose (); +#if defined __stub_SSL_CTX_set_purpose || defined __stub___SSL_CTX_set_purpose +choke me +#endif + +int main (void) +{ +return SSL_CTX_set_purpose (); + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + + tst_api="0x095" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + fi + if test "$tst_api" = "unknown"; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +#define OBJ_obj2txt innocuous_OBJ_obj2txt +#ifdef __STDC__ +# include +#else +# include +#endif +#undef OBJ_obj2txt +#ifdef __cplusplus +extern "C" +#endif +char OBJ_obj2txt (); +#if defined __stub_OBJ_obj2txt || defined __stub___OBJ_obj2txt +choke me +#endif + +int main (void) +{ +return OBJ_obj2txt (); + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + + tst_api="0x094" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + fi + if test "$tst_api" = "unknown"; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +#define SSL_get_verify_depth innocuous_SSL_get_verify_depth +#ifdef __STDC__ +# include +#else +# include +#endif +#undef SSL_get_verify_depth +#ifdef __cplusplus +extern "C" +#endif +char SSL_get_verify_depth (); +#if defined __stub_SSL_get_verify_depth || defined __stub___SSL_get_verify_depth +choke me +#endif + +int main (void) +{ +return SSL_get_verify_depth (); + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + + tst_api="0x093" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + fi + if test "$tst_api" = "unknown"; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +#define SSL_library_init innocuous_SSL_library_init +#ifdef __STDC__ +# include +#else +# include +#endif +#undef SSL_library_init +#ifdef __cplusplus +extern "C" +#endif +char SSL_library_init (); +#if defined __stub_SSL_library_init || defined __stub___SSL_library_init +choke me +#endif + +int main (void) +{ +return SSL_library_init (); + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + + tst_api="0x092" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + fi + if test "$tst_api" = "unknown"; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +#define SSL_CTX_set_cipher_list innocuous_SSL_CTX_set_cipher_list +#ifdef __STDC__ +# include +#else +# include +#endif +#undef SSL_CTX_set_cipher_list +#ifdef __cplusplus +extern "C" +#endif +char SSL_CTX_set_cipher_list (); +#if defined __stub_SSL_CTX_set_cipher_list || defined __stub___SSL_CTX_set_cipher_list +choke me +#endif + +int main (void) +{ +return SSL_CTX_set_cipher_list (); + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + + tst_api="0x091" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + fi + case $tst_api in + 0x300) tst_show="3.0.0" ;; + 0x111) tst_show="1.1.1" ;; + 0x110) tst_show="1.1.0" ;; + 0x102) tst_show="1.0.2" ;; + 0x101) tst_show="1.0.1" ;; + 0x100) tst_show="1.0.0" ;; + 0x099) tst_show="0.9.9" ;; + 0x098) tst_show="0.9.8" ;; + 0x097) tst_show="0.9.7" ;; + 0x096) tst_show="0.9.6" ;; + 0x095) tst_show="0.9.5" ;; + 0x094) tst_show="0.9.4" ;; + 0x093) tst_show="0.9.3" ;; + 0x092) tst_show="0.9.2" ;; + 0x091) tst_show="0.9.1" ;; + *) tst_show="unknown" ;; + esac + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $tst_show" >&5 +printf "%s\n" "$tst_show" >&6; } + # + curl_openssl_api_library=$tst_api + + # + tst_match="yes" + # + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for OpenSSL headers and library versions matching" >&5 +printf %s "checking for OpenSSL headers and library versions matching... " >&6; } + if test "$curl_openssl_api_headers" = "unknown" || + test "$curl_openssl_api_library" = "unknown"; then + tst_match="fail" + tst_warns="Can not compare OpenSSL headers and library versions." + elif test "$curl_openssl_api_headers" != "$curl_openssl_api_library"; then + tst_match="no" + tst_warns="OpenSSL headers and library versions do not match." + fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $tst_match" >&5 +printf "%s\n" "$tst_match" >&6; } + if test "$tst_match" != "yes"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $tst_warns" >&5 +printf "%s\n" "$as_me: WARNING: $tst_warns" >&2;} + fi + check_for_ca_bundle=1 fi @@ -26312,44 +26487,52 @@ printf "%s\n" "#define RANDOM_FILE \"$RANDOM_FILE\"" >>confdefs.h fi if test "$OPENSSL_ENABLED" = "1"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SRP support in OpenSSL" >&5 -printf %s "checking for SRP support in OpenSSL... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SRP_Calc_client_key in -lcrypto" >&5 +printf %s "checking for SRP_Calc_client_key in -lcrypto... " >&6; } +if test ${ac_cv_lib_crypto_SRP_Calc_client_key+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_check_lib_save_LIBS=$LIBS +LIBS="-lcrypto $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include - +#ifdef __cplusplus +extern "C" +#endif +char SRP_Calc_client_key (); int main (void) { - - SSL_CTX_set_srp_username(NULL, ""); - SSL_CTX_set_srp_password(NULL, ""); - +return SRP_Calc_client_key (); ; return 0; } - _ACEOF if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_crypto_SRP_Calc_client_key=yes +else $as_nop + ac_cv_lib_crypto_SRP_Calc_client_key=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_SRP_Calc_client_key" >&5 +printf "%s\n" "$ac_cv_lib_crypto_SRP_Calc_client_key" >&6; } +if test "x$ac_cv_lib_crypto_SRP_Calc_client_key" = xyes then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } printf "%s\n" "#define HAVE_OPENSSL_SRP 1" >>confdefs.h - HAVE_OPENSSL_SRP=1 - + HAVE_OPENSSL_SRP=1 -else $as_nop - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext + fi if test X"$OPENSSL_ENABLED" = X"1"; then @@ -27287,6 +27470,18 @@ then : printf "%s\n" "#define HAVE_WOLFSSL_DES_ECB_ENCRYPT 1" >>confdefs.h + if test -n "$addcflags"; then + for f in $addcflags; do + CPPFLAGS="$f/wolfssl $CPPFLAGS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Add $f/wolfssl to CPPFLAGS" >&5 +printf "%s\n" "$as_me: Add $f/wolfssl to CPPFLAGS" >&6;} + break + done + else + CPPFLAGS="-I/usr/include/wolfssl $CPPFLAGS" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Add /usr/include/wolfssl to CPPFLAGS" >&5 +printf "%s\n" "$as_me: Add /usr/include/wolfssl to CPPFLAGS" >&6;} + fi WOLFSSL_NTLM=1 @@ -27311,6 +27506,165 @@ fi +if test "x$OPT_MESALINK" != xno; then + _cppflags=$CPPFLAGS + _ldflags=$LDFLAGS + ssl_msg= + + if test X"$OPT_MESALINK" != Xno; then + + if test "$OPT_MESALINK" = "yes"; then + OPT_MESALINK="" + fi + + if test -z "$OPT_MESALINK" ; then + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mesalink_library_init in -lmesalink" >&5 +printf %s "checking for mesalink_library_init in -lmesalink... " >&6; } +if test ${ac_cv_lib_mesalink_mesalink_library_init+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_check_lib_save_LIBS=$LIBS +LIBS="-lmesalink $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +#ifdef __cplusplus +extern "C" +#endif +char mesalink_library_init (); +int main (void) +{ +return mesalink_library_init (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_mesalink_mesalink_library_init=yes +else $as_nop + ac_cv_lib_mesalink_mesalink_library_init=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mesalink_mesalink_library_init" >&5 +printf "%s\n" "$ac_cv_lib_mesalink_mesalink_library_init" >&6; } +if test "x$ac_cv_lib_mesalink_mesalink_library_init" = xyes +then : + + +printf "%s\n" "#define USE_MESALINK 1" >>confdefs.h + + USE_MESALINK=1 + + MESALINK_ENABLED=1 + USE_MESALINK="yes" + ssl_msg="MesaLink" + test mesalink != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes + +fi + + fi + + addld="" + addlib="" + addcflags="" + mesalinklib="" + + if test "x$USE_MESALINK" != "xyes"; then + addld=-L$OPT_MESALINK/lib$libsuff + addcflags=-I$OPT_MESALINK/include + mesalinklib=$OPT_MESALINK/lib$libsuff + + LDFLAGS="$LDFLAGS $addld" + if test "$addcflags" != "-I/usr/include"; then + CPPFLAGS="$CPPFLAGS $addcflags" + fi + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mesalink_library_init in -lmesalink" >&5 +printf %s "checking for mesalink_library_init in -lmesalink... " >&6; } +if test ${ac_cv_lib_mesalink_mesalink_library_init+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_check_lib_save_LIBS=$LIBS +LIBS="-lmesalink $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +#ifdef __cplusplus +extern "C" +#endif +char mesalink_library_init (); +int main (void) +{ +return mesalink_library_init (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_mesalink_mesalink_library_init=yes +else $as_nop + ac_cv_lib_mesalink_mesalink_library_init=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mesalink_mesalink_library_init" >&5 +printf "%s\n" "$ac_cv_lib_mesalink_mesalink_library_init" >&6; } +if test "x$ac_cv_lib_mesalink_mesalink_library_init" = xyes +then : + + +printf "%s\n" "#define USE_MESALINK 1" >>confdefs.h + + USE_MESALINK=1 + + MESALINK_ENABLED=1 + USE_MESALINK="yes" + ssl_msg="MesaLink" + test mesalink != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes + +else $as_nop + + CPPFLAGS=$_cppflags + LDFLAGS=$_ldflags + +fi + + fi + + if test "x$USE_MESALINK" = "xyes"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: detected MesaLink" >&5 +printf "%s\n" "$as_me: detected MesaLink" >&6;} + + LIBS="-lmesalink $LIBS" + + if test -n "$mesalinklib"; then + if test "x$cross_compiling" != "xyes"; then + LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$mesalinklib" + export LD_LIBRARY_PATH + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Added $mesalinklib to LD_LIBRARY_PATH" >&5 +printf "%s\n" "$as_me: Added $mesalinklib to LD_LIBRARY_PATH" >&6;} + fi + fi + fi + + fi + test -z "$ssl_msg" || ssl_backends="${ssl_backends:+$ssl_backends, }$ssl_msg" +fi + + + if test "x$OPT_BEARSSL" != xno; then _cppflags=$CPPFLAGS _ldflags=$LDFLAGS @@ -27484,14 +27838,14 @@ if test "x$OPT_RUSTLS" != xno; then if test -z "$OPT_RUSTLS" ; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for rustls_client_session_read in -lrustls" >&5 -printf %s "checking for rustls_client_session_read in -lrustls... " >&6; } -if test ${ac_cv_lib_rustls_rustls_client_session_read+y} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for rustls_client_session_read in -lcrustls" >&5 +printf %s "checking for rustls_client_session_read in -lcrustls... " >&6; } +if test ${ac_cv_lib_crustls_rustls_client_session_read+y} then : printf %s "(cached) " >&6 else $as_nop ac_check_lib_save_LIBS=$LIBS -LIBS="-lrustls -lpthread -ldl -lm $LIBS" +LIBS="-lcrustls -lpthread -ldl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -27509,17 +27863,17 @@ return rustls_client_session_read (); _ACEOF if ac_fn_c_try_link "$LINENO" then : - ac_cv_lib_rustls_rustls_client_session_read=yes + ac_cv_lib_crustls_rustls_client_session_read=yes else $as_nop - ac_cv_lib_rustls_rustls_client_session_read=no + ac_cv_lib_crustls_rustls_client_session_read=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rustls_rustls_client_session_read" >&5 -printf "%s\n" "$ac_cv_lib_rustls_rustls_client_session_read" >&6; } -if test "x$ac_cv_lib_rustls_rustls_client_session_read" = xyes +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crustls_rustls_client_session_read" >&5 +printf "%s\n" "$ac_cv_lib_crustls_rustls_client_session_read" >&6; } +if test "x$ac_cv_lib_crustls_rustls_client_session_read" = xyes then : @@ -27536,6 +27890,11 @@ fi fi + addld="" + addlib="-lpthread" + addcflags="" + bearssllib="" + if test "x$USE_RUSTLS" != "xyes"; then addld=-L$OPT_RUSTLS/lib$libsuff addcflags=-I$OPT_RUSTLS/include @@ -27546,14 +27905,14 @@ fi CPPFLAGS="$CPPFLAGS $addcflags" fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for rustls_connection_read in -lrustls" >&5 -printf %s "checking for rustls_connection_read in -lrustls... " >&6; } -if test ${ac_cv_lib_rustls_rustls_connection_read+y} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for rustls_connection_read in -lcrustls" >&5 +printf %s "checking for rustls_connection_read in -lcrustls... " >&6; } +if test ${ac_cv_lib_crustls_rustls_connection_read+y} then : printf %s "(cached) " >&6 else $as_nop ac_check_lib_save_LIBS=$LIBS -LIBS="-lrustls -lpthread -ldl -lm $LIBS" +LIBS="-lcrustls -lpthread -ldl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -27571,17 +27930,17 @@ return rustls_connection_read (); _ACEOF if ac_fn_c_try_link "$LINENO" then : - ac_cv_lib_rustls_rustls_connection_read=yes + ac_cv_lib_crustls_rustls_connection_read=yes else $as_nop - ac_cv_lib_rustls_rustls_connection_read=no + ac_cv_lib_crustls_rustls_connection_read=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rustls_rustls_connection_read" >&5 -printf "%s\n" "$ac_cv_lib_rustls_rustls_connection_read" >&6; } -if test "x$ac_cv_lib_rustls_rustls_connection_read" = xyes +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crustls_rustls_connection_read" >&5 +printf "%s\n" "$ac_cv_lib_crustls_rustls_connection_read" >&6; } +if test "x$ac_cv_lib_crustls_rustls_connection_read" = xyes then : @@ -27605,7 +27964,7 @@ fi printf "%s\n" "$as_me: detected rustls" >&6;} check_for_ca_bundle=1 - LIBS="-lrustls -lpthread -ldl -lm $LIBS" + LIBS="-lcrustls -lpthread -ldl $LIBS" if test -n "$rustlslib"; then if test "x$cross_compiling" != "xyes"; then @@ -28079,13 +28438,13 @@ if test "x$USE_WIN32_CRYPTO" = "x1" -o "x$USE_SCHANNEL" = "x1"; then LIBS="-ladvapi32 -lcrypt32 $LIBS" fi -case "x$OPENSSL_ENABLED$GNUTLS_ENABLED$NSS_ENABLED$MBEDTLS_ENABLED$WOLFSSL_ENABLED$SCHANNEL_ENABLED$SECURETRANSPORT_ENABLED$BEARSSL_ENABLED$AMISSL_ENABLED$RUSTLS_ENABLED" +case "x$OPENSSL_ENABLED$GNUTLS_ENABLED$NSS_ENABLED$MBEDTLS_ENABLED$WOLFSSL_ENABLED$SCHANNEL_ENABLED$SECURETRANSPORT_ENABLED$MESALINK_ENABLED$BEARSSL_ENABLED$AMISSL_ENABLED$RUSTLS_ENABLED" in x) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: SSL disabled, you will not be able to use HTTPS, FTPS, NTLM and more." >&5 printf "%s\n" "$as_me: WARNING: SSL disabled, you will not be able to use HTTPS, FTPS, NTLM and more." >&2;} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Use --with-openssl, --with-gnutls, --with-wolfssl, --with-mbedtls, --with-nss, --with-schannel, --with-secure-transport, --with-amissl, --with-bearssl or --with-rustls to address this." >&5 -printf "%s\n" "$as_me: WARNING: Use --with-openssl, --with-gnutls, --with-wolfssl, --with-mbedtls, --with-nss, --with-schannel, --with-secure-transport, --with-amissl, --with-bearssl or --with-rustls to address this." >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Use --with-openssl, --with-gnutls, --with-wolfssl, --with-mbedtls, --with-nss, --with-schannel, --with-secure-transport, --with-mesalink, --with-amissl, --with-bearssl or --with-rustls to address this." >&5 +printf "%s\n" "$as_me: WARNING: Use --with-openssl, --with-gnutls, --with-wolfssl, --with-mbedtls, --with-nss, --with-schannel, --with-secure-transport, --with-mesalink, --with-amissl, --with-bearssl or --with-rustls to address this." >&2;} ;; x1) # one SSL backend is enabled @@ -29415,9 +29774,6 @@ else fi -CURL_PLIST_VERSION="$CURLVERSION" - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable Windows native IDN (Windows native builds only)" >&5 printf %s "checking whether to enable Windows native IDN (Windows native builds only)... " >&6; } @@ -29566,37 +29922,31 @@ then : withval=$with_libidn2; OPT_IDN=$withval fi -if test "x$tst_links_winidn" = "xyes"; then - want_idn="no" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no (using winidn instead)" >&5 -printf "%s\n" "no (using winidn instead)" >&6; } -else - case "$OPT_IDN" in - no) - want_idn="no" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +case "$OPT_IDN" in + no) + want_idn="no" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - ;; - default) - want_idn="yes" - want_idn_path="default" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: (assumed) yes" >&5 + ;; + default) + want_idn="yes" + want_idn_path="default" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: (assumed) yes" >&5 printf "%s\n" "(assumed) yes" >&6; } - ;; - yes) - want_idn="yes" - want_idn_path="default" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + ;; + yes) + want_idn="yes" + want_idn_path="default" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - ;; - *) - want_idn="yes" - want_idn_path="$withval" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes ($withval)" >&5 + ;; + *) + want_idn="yes" + want_idn_path="$withval" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes ($withval)" >&5 printf "%s\n" "yes ($withval)" >&6; } - ;; - esac -fi + ;; +esac if test "$want_idn" = "yes"; then clean_CPPFLAGS="$CPPFLAGS" @@ -30038,12 +30388,10 @@ case "$OPT_H2" in yes) want_nghttp2="default" want_nghttp2_path="" - want_nghttp2_pkg_config_path="" ;; *) want_nghttp2="yes" - want_nghttp2_path="$withval" - want_nghttp2_pkg_config_path="$withval/lib/pkgconfig" + want_nghttp2_path="$withval/lib/pkgconfig" ;; esac @@ -30172,8 +30520,8 @@ fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libnghttp2 options with pkg-config" >&5 printf %s "checking for libnghttp2 options with pkg-config... " >&6; } itexists=` - if test -n "$want_nghttp2_pkg_config_path"; then - PKG_CONFIG_LIBDIR="$want_nghttp2_pkg_config_path" + if test -n "$want_nghttp2_path"; then + PKG_CONFIG_LIBDIR="$want_nghttp2_path" export PKG_CONFIG_LIBDIR fi $PKGCONFIG --exists libnghttp2 >/dev/null 2>&1 && echo 1` @@ -30191,8 +30539,8 @@ printf "%s\n" "found" >&6; } if test "$PKGCONFIG" != "no" ; then LIB_H2=` - if test -n "$want_nghttp2_pkg_config_path"; then - PKG_CONFIG_LIBDIR="$want_nghttp2_pkg_config_path" + if test -n "$want_nghttp2_path"; then + PKG_CONFIG_LIBDIR="$want_nghttp2_path" export PKG_CONFIG_LIBDIR fi @@ -30201,8 +30549,8 @@ printf "%s\n" "found" >&6; } printf "%s\n" "$as_me: -l is $LIB_H2" >&6;} CPP_H2=` - if test -n "$want_nghttp2_pkg_config_path"; then - PKG_CONFIG_LIBDIR="$want_nghttp2_pkg_config_path" + if test -n "$want_nghttp2_path"; then + PKG_CONFIG_LIBDIR="$want_nghttp2_path" export PKG_CONFIG_LIBDIR fi $PKGCONFIG --cflags-only-I libnghttp2` @@ -30210,8 +30558,8 @@ printf "%s\n" "$as_me: -l is $LIB_H2" >&6;} printf "%s\n" "$as_me: -I is $CPP_H2" >&6;} LD_H2=` - if test -n "$want_nghttp2_pkg_config_path"; then - PKG_CONFIG_LIBDIR="$want_nghttp2_pkg_config_path" + if test -n "$want_nghttp2_path"; then + PKG_CONFIG_LIBDIR="$want_nghttp2_path" export PKG_CONFIG_LIBDIR fi @@ -30219,23 +30567,13 @@ printf "%s\n" "$as_me: -I is $CPP_H2" >&6;} { printf "%s\n" "$as_me:${as_lineno-$LINENO}: -L is $LD_H2" >&5 printf "%s\n" "$as_me: -L is $LD_H2" >&6;} - DIR_H2=`echo $LD_H2 | $SED -e 's/^-L//'` - elif test x"$want_nghttp2_path" != x; then - LIB_H2="-lnghttp2" - LD_H2=-L${want_nghttp2_path}/lib$libsuff - CPP_H2=-I${want_nghttp2_path}/include - DIR_H2=${want_nghttp2_path}/lib$libsuff - elif test X"$want_nghttp2" != Xdefault; then - as_fn_error $? "--with-nghttp2 was specified but could not find libnghttp2 pkg-config file." "$LINENO" 5 - fi + LDFLAGS="$LDFLAGS $LD_H2" + CPPFLAGS="$CPPFLAGS $CPP_H2" + LIBS="$LIB_H2 $LIBS" - LDFLAGS="$LDFLAGS $LD_H2" - CPPFLAGS="$CPPFLAGS $CPP_H2" - LIBS="$LIB_H2 $LIBS" - - # use nghttp2_session_set_local_window_size to require nghttp2 - # >= 1.12.0 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for nghttp2_session_set_local_window_size in -lnghttp2" >&5 + # use nghttp2_session_set_local_window_size to require nghttp2 + # >= 1.12.0 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for nghttp2_session_set_local_window_size in -lnghttp2" >&5 printf %s "checking for nghttp2_session_set_local_window_size in -lnghttp2... " >&6; } if test ${ac_cv_lib_nghttp2_nghttp2_session_set_local_window_size+y} then : @@ -30273,36 +30611,38 @@ printf "%s\n" "$ac_cv_lib_nghttp2_nghttp2_session_set_local_window_size" >&6; } if test "x$ac_cv_lib_nghttp2_nghttp2_session_set_local_window_size" = xyes then : - for ac_header in nghttp2/nghttp2.h + for ac_header in nghttp2/nghttp2.h do : ac_fn_c_check_header_compile "$LINENO" "nghttp2/nghttp2.h" "ac_cv_header_nghttp2_nghttp2_h" "$ac_includes_default" if test "x$ac_cv_header_nghttp2_nghttp2_h" = xyes then : printf "%s\n" "#define HAVE_NGHTTP2_NGHTTP2_H 1" >>confdefs.h curl_h2_msg="enabled (nghttp2)" - NGHTTP2_ENABLED=1 + NGHTTP2_ENABLED=1 printf "%s\n" "#define USE_NGHTTP2 1" >>confdefs.h - USE_NGHTTP2=1 + USE_NGHTTP2=1 fi done - CURL_LIBRARY_PATH="$CURL_LIBRARY_PATH:$DIR_H2" - export CURL_LIBRARY_PATH - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Added $DIR_H2 to CURL_LIBRARY_PATH" >&5 -printf "%s\n" "$as_me: Added $DIR_H2 to CURL_LIBRARY_PATH" >&6;} - else $as_nop - LDFLAGS=$CLEANLDFLAGS - CPPFLAGS=$CLEANCPPFLAGS - LIBS=$CLEANLIBS + LDFLAGS=$CLEANLDFLAGS + CPPFLAGS=$CLEANCPPFLAGS + LIBS=$CLEANLIBS fi + + else + if test X"$want_nghttp2" != Xdefault; then + as_fn_error $? "--with-nghttp2 was specified but could not find libnghttp2 pkg-config file." "$LINENO" 5 + fi + fi + fi @@ -30768,9 +31108,9 @@ printf "%s\n" "$as_me: -L is $LD_NGTCP2_CRYPTO_OPENSSL" >&6;} if test "x$cross_compiling" != "xyes"; then DIR_NGTCP2_CRYPTO_OPENSSL=`echo $LD_NGTCP2_CRYPTO_OPENSSL | $SED -e 's/^-L//'` fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ngtcp2_crypto_recv_client_initial_cb in -lngtcp2_crypto_openssl" >&5 -printf %s "checking for ngtcp2_crypto_recv_client_initial_cb in -lngtcp2_crypto_openssl... " >&6; } -if test ${ac_cv_lib_ngtcp2_crypto_openssl_ngtcp2_crypto_recv_client_initial_cb+y} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ngtcp2_crypto_ctx_initial in -lngtcp2_crypto_openssl" >&5 +printf %s "checking for ngtcp2_crypto_ctx_initial in -lngtcp2_crypto_openssl... " >&6; } +if test ${ac_cv_lib_ngtcp2_crypto_openssl_ngtcp2_crypto_ctx_initial+y} then : printf %s "(cached) " >&6 else $as_nop @@ -30783,27 +31123,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ngtcp2_crypto_recv_client_initial_cb (); +char ngtcp2_crypto_ctx_initial (); int main (void) { -return ngtcp2_crypto_recv_client_initial_cb (); +return ngtcp2_crypto_ctx_initial (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO" then : - ac_cv_lib_ngtcp2_crypto_openssl_ngtcp2_crypto_recv_client_initial_cb=yes + ac_cv_lib_ngtcp2_crypto_openssl_ngtcp2_crypto_ctx_initial=yes else $as_nop - ac_cv_lib_ngtcp2_crypto_openssl_ngtcp2_crypto_recv_client_initial_cb=no + ac_cv_lib_ngtcp2_crypto_openssl_ngtcp2_crypto_ctx_initial=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ngtcp2_crypto_openssl_ngtcp2_crypto_recv_client_initial_cb" >&5 -printf "%s\n" "$ac_cv_lib_ngtcp2_crypto_openssl_ngtcp2_crypto_recv_client_initial_cb" >&6; } -if test "x$ac_cv_lib_ngtcp2_crypto_openssl_ngtcp2_crypto_recv_client_initial_cb" = xyes +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ngtcp2_crypto_openssl_ngtcp2_crypto_ctx_initial" >&5 +printf "%s\n" "$ac_cv_lib_ngtcp2_crypto_openssl_ngtcp2_crypto_ctx_initial" >&6; } +if test "x$ac_cv_lib_ngtcp2_crypto_openssl_ngtcp2_crypto_ctx_initial" = xyes then : for ac_header in ngtcp2/ngtcp2_crypto.h @@ -31021,9 +31361,9 @@ printf "%s\n" "$as_me: -L is $LD_NGTCP2_CRYPTO_GNUTLS" >&6;} if test "x$cross_compiling" != "xyes"; then DIR_NGTCP2_CRYPTO_GNUTLS=`echo $LD_NGTCP2_CRYPTO_GNUTLS | $SED -e 's/^-L//'` fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ngtcp2_crypto_recv_client_initial_cb in -lngtcp2_crypto_gnutls" >&5 -printf %s "checking for ngtcp2_crypto_recv_client_initial_cb in -lngtcp2_crypto_gnutls... " >&6; } -if test ${ac_cv_lib_ngtcp2_crypto_gnutls_ngtcp2_crypto_recv_client_initial_cb+y} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ngtcp2_crypto_ctx_initial in -lngtcp2_crypto_gnutls" >&5 +printf %s "checking for ngtcp2_crypto_ctx_initial in -lngtcp2_crypto_gnutls... " >&6; } +if test ${ac_cv_lib_ngtcp2_crypto_gnutls_ngtcp2_crypto_ctx_initial+y} then : printf %s "(cached) " >&6 else $as_nop @@ -31036,27 +31376,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ngtcp2_crypto_recv_client_initial_cb (); +char ngtcp2_crypto_ctx_initial (); int main (void) { -return ngtcp2_crypto_recv_client_initial_cb (); +return ngtcp2_crypto_ctx_initial (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO" then : - ac_cv_lib_ngtcp2_crypto_gnutls_ngtcp2_crypto_recv_client_initial_cb=yes + ac_cv_lib_ngtcp2_crypto_gnutls_ngtcp2_crypto_ctx_initial=yes else $as_nop - ac_cv_lib_ngtcp2_crypto_gnutls_ngtcp2_crypto_recv_client_initial_cb=no + ac_cv_lib_ngtcp2_crypto_gnutls_ngtcp2_crypto_ctx_initial=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ngtcp2_crypto_gnutls_ngtcp2_crypto_recv_client_initial_cb" >&5 -printf "%s\n" "$ac_cv_lib_ngtcp2_crypto_gnutls_ngtcp2_crypto_recv_client_initial_cb" >&6; } -if test "x$ac_cv_lib_ngtcp2_crypto_gnutls_ngtcp2_crypto_recv_client_initial_cb" = xyes +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ngtcp2_crypto_gnutls_ngtcp2_crypto_ctx_initial" >&5 +printf "%s\n" "$ac_cv_lib_ngtcp2_crypto_gnutls_ngtcp2_crypto_ctx_initial" >&6; } +if test "x$ac_cv_lib_ngtcp2_crypto_gnutls_ngtcp2_crypto_ctx_initial" = xyes then : for ac_header in ngtcp2/ngtcp2_crypto.h @@ -31681,125 +32021,6 @@ fi fi -OPT_MSH3="no" - -if test "x$disable_http" = "xyes" -o "x$USE_NGTCP" = "x1"; then - # without HTTP or with ngtcp2, msh3 is no use - OPT_MSH3="no" -fi - - -# Check whether --with-msh3 was given. -if test ${with_msh3+y} -then : - withval=$with_msh3; OPT_MSH3=$withval -fi - -case "$OPT_MSH3" in - no) - want_msh3="no" - ;; - yes) - want_msh3="default" - want_msh3_path="" - ;; - *) - want_msh3="yes" - want_msh3_path="$withval" - ;; -esac - -if test X"$want_msh3" != Xno; then - - if test "$NGHTTP3_ENABLED" = 1; then - as_fn_error $? "--with-msh3 and --with-ngtcp2 are mutually exclusive" "$LINENO" 5 - fi - - CLEANLDFLAGS="$LDFLAGS" - CLEANCPPFLAGS="$CPPFLAGS" - CLEANLIBS="$LIBS" - - if test -n "$want_msh3_path"; then - LD_MSH3="-L$want_msh3_path/lib" - CPP_MSH3="-I$want_msh3_path/include" - DIR_MSH3="$want_msh3_path/lib" - LDFLAGS="$LDFLAGS $LD_MSH3" - CPPFLAGS="$CPPFLAGS $CPP_MSH3" - fi - LIBS="-lmsh3 $LIBS" - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MsH3ApiOpen in -lmsh3" >&5 -printf %s "checking for MsH3ApiOpen in -lmsh3... " >&6; } -if test ${ac_cv_lib_msh3_MsH3ApiOpen+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS -LIBS="-lmsh3 $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - -#ifdef __cplusplus -extern "C" -#endif -char MsH3ApiOpen (); -int main (void) -{ -return MsH3ApiOpen (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - ac_cv_lib_msh3_MsH3ApiOpen=yes -else $as_nop - ac_cv_lib_msh3_MsH3ApiOpen=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_msh3_MsH3ApiOpen" >&5 -printf "%s\n" "$ac_cv_lib_msh3_MsH3ApiOpen" >&6; } -if test "x$ac_cv_lib_msh3_MsH3ApiOpen" = xyes -then : - - for ac_header in msh3.h -do : - ac_fn_c_check_header_compile "$LINENO" "msh3.h" "ac_cv_header_msh3_h" "$ac_includes_default" -if test "x$ac_cv_header_msh3_h" = xyes -then : - printf "%s\n" "#define HAVE_MSH3_H 1" >>confdefs.h - curl_h3_msg="enabled (msh3)" - MSH3_ENABLED=1 - -printf "%s\n" "#define USE_MSH3 1" >>confdefs.h - - USE_MSH3=1 - - CURL_LIBRARY_PATH="$CURL_LIBRARY_PATH:$DIR_MSH3" - export CURL_LIBRARY_PATH - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Added $DIR_MSH3 to CURL_LIBRARY_PATH" >&5 -printf "%s\n" "$as_me: Added $DIR_MSH3 to CURL_LIBRARY_PATH" >&6;} -else $as_nop - experimental="$experimental HTTP3" - -fi - -done - -else $as_nop - LDFLAGS=$CLEANLDFLAGS - CPPFLAGS=$CLEANCPPFLAGS - LIBS=$CLEANLIBS - -fi - -fi - - OPT_ZSH_FPATH=default # Check whether --with-zsh-functions-dir was given. @@ -32537,44 +32758,12 @@ ac_fn_c_check_header_compile "$LINENO" "netinet/in.h" "ac_cv_header_netinet_in_h " -if test "x$ac_cv_header_netinet_in_h" = xyes -then : - printf "%s\n" "#define HAVE_NETINET_IN_H 1" >>confdefs.h - -fi -ac_fn_c_check_header_compile "$LINENO" "netinet/in6.h" "ac_cv_header_netinet_in6_h" " -#ifdef HAVE_SYS_TYPES_H -#include -#endif -#ifdef HAVE_SYS_TIME_H -#include -#endif -#ifdef HAVE_SYS_SELECT_H -#include -#elif defined(HAVE_UNISTD_H) -#include -#endif -#ifdef HAVE_SYS_SOCKET_H -#include -#endif -#ifdef HAVE_NETINET_IN_H -#include -#endif -#ifdef HAVE_NETINET_IN6_H -#include -#endif -#ifdef HAVE_SYS_UN_H -#include -#endif - - -" -if test "x$ac_cv_header_netinet_in6_h" = xyes +if test "x$ac_cv_header_netinet_in_h" = xyes then : - printf "%s\n" "#define HAVE_NETINET_IN6_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_NETINET_IN_H 1" >>confdefs.h fi -ac_fn_c_check_header_compile "$LINENO" "sys/un.h" "ac_cv_header_sys_un_h" " +ac_fn_c_check_header_compile "$LINENO" "netinet/in6.h" "ac_cv_header_netinet_in6_h" " #ifdef HAVE_SYS_TYPES_H #include #endif @@ -32601,12 +32790,12 @@ ac_fn_c_check_header_compile "$LINENO" "sys/un.h" "ac_cv_header_sys_un_h" " " -if test "x$ac_cv_header_sys_un_h" = xyes +if test "x$ac_cv_header_netinet_in6_h" = xyes then : - printf "%s\n" "#define HAVE_SYS_UN_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_NETINET_IN6_H 1" >>confdefs.h fi -ac_fn_c_check_header_compile "$LINENO" "linux/tcp.h" "ac_cv_header_linux_tcp_h" " +ac_fn_c_check_header_compile "$LINENO" "sys/un.h" "ac_cv_header_sys_un_h" " #ifdef HAVE_SYS_TYPES_H #include #endif @@ -32633,12 +32822,12 @@ ac_fn_c_check_header_compile "$LINENO" "linux/tcp.h" "ac_cv_header_linux_tcp_h" " -if test "x$ac_cv_header_linux_tcp_h" = xyes +if test "x$ac_cv_header_sys_un_h" = xyes then : - printf "%s\n" "#define HAVE_LINUX_TCP_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_SYS_UN_H 1" >>confdefs.h fi -ac_fn_c_check_header_compile "$LINENO" "netinet/tcp.h" "ac_cv_header_netinet_tcp_h" " +ac_fn_c_check_header_compile "$LINENO" "linux/tcp.h" "ac_cv_header_linux_tcp_h" " #ifdef HAVE_SYS_TYPES_H #include #endif @@ -32665,12 +32854,12 @@ ac_fn_c_check_header_compile "$LINENO" "netinet/tcp.h" "ac_cv_header_netinet_tcp " -if test "x$ac_cv_header_netinet_tcp_h" = xyes +if test "x$ac_cv_header_linux_tcp_h" = xyes then : - printf "%s\n" "#define HAVE_NETINET_TCP_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_LINUX_TCP_H 1" >>confdefs.h fi -ac_fn_c_check_header_compile "$LINENO" "netinet/udp.h" "ac_cv_header_netinet_udp_h" " +ac_fn_c_check_header_compile "$LINENO" "netinet/tcp.h" "ac_cv_header_netinet_tcp_h" " #ifdef HAVE_SYS_TYPES_H #include #endif @@ -32697,9 +32886,9 @@ ac_fn_c_check_header_compile "$LINENO" "netinet/udp.h" "ac_cv_header_netinet_udp " -if test "x$ac_cv_header_netinet_udp_h" = xyes +if test "x$ac_cv_header_netinet_tcp_h" = xyes then : - printf "%s\n" "#define HAVE_NETINET_UDP_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_NETINET_TCP_H 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "netdb.h" "ac_cv_header_netdb_h" " @@ -33768,9 +33957,10 @@ printf "%s\n" "#define HAVE_STRUCT_TIMEVAL 1" >>confdefs.h { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking run-time libs availability" >&5 printf %s "checking run-time libs availability... " >&6; } - case $host_os in - darwin*) - if test "$cross_compiling" = yes + old=$LD_LIBRARY_PATH + LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old + export LD_LIBRARY_PATH + if test "$cross_compiling" = yes then : { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} @@ -33800,44 +33990,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi - ;; - *) - old=$LD_LIBRARY_PATH - LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old - export LD_LIBRARY_PATH - if test "$cross_compiling" = yes -then : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run test program while cross compiling -See \`config.log' for more details" "$LINENO" 5; } -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int main() -{ - return 0; -} - -_ACEOF -if ac_fn_c_try_run "$LINENO" -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: fine" >&5 -printf "%s\n" "fine" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5 -printf "%s\n" "failed" >&6; } - as_fn_error $? "one or more libs available at link-time are not available run-time. Libs used at link-time: $LIBS" "$LINENO" 5 - -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - LD_LIBRARY_PATH=$old # restore - ;; - esac + LD_LIBRARY_PATH=$old # restore fi @@ -34262,9 +34415,10 @@ fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if time_t is unsigned" >&5 printf %s "checking if time_t is unsigned... " >&6; } - case $host_os in - darwin*) - if test "$cross_compiling" = yes + old=$LD_LIBRARY_PATH + LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old + export LD_LIBRARY_PATH + if test "$cross_compiling" = yes then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } @@ -34296,46 +34450,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi - ;; - *) - old=$LD_LIBRARY_PATH - LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old - export LD_LIBRARY_PATH - if test "$cross_compiling" = yes -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - #include - #include - time_t t = -1; - return (t > 0); - -_ACEOF -if ac_fn_c_try_run "$LINENO" -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - -printf "%s\n" "#define HAVE_TIME_T_UNSIGNED 1" >>confdefs.h - - -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - LD_LIBRARY_PATH=$old # restore - ;; - esac + LD_LIBRARY_PATH=$old # restore @@ -36354,7 +36469,7 @@ printf "%s\n" "#define HAVE_FCNTL 1" >>confdefs.h tst_allow_fcntl_o_nonblock="unknown" # case $host_os in - sunos4* | aix3*) + sunos4* | aix3* | beos*) curl_disallow_fcntl_o_nonblock="yes" ;; esac @@ -37322,9 +37437,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if getaddrinfo seems to work" >&5 printf %s "checking if getaddrinfo seems to work... " >&6; } - case $host_os in - darwin*) - if test "$cross_compiling" = yes + old=$LD_LIBRARY_PATH + LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old + export LD_LIBRARY_PATH + if test "$cross_compiling" = yes then : { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} @@ -37385,75 +37501,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi - ;; - *) - old=$LD_LIBRARY_PATH - LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old - export LD_LIBRARY_PATH - if test "$cross_compiling" = yes -then : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run test program while cross compiling -See \`config.log' for more details" "$LINENO" 5; } -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - - $curl_includes_ws2tcpip - $curl_includes_stdlib - $curl_includes_string - $curl_includes_sys_socket - $curl_includes_netdb - -int main (void) -{ - - struct addrinfo hints; - struct addrinfo *ai = 0; - int error; - - #ifdef HAVE_WINSOCK2_H - WSADATA wsa; - if (WSAStartup(MAKEWORD(2,2), &wsa)) - exit(2); - #endif - - memset(&hints, 0, sizeof(hints)); - hints.ai_flags = AI_NUMERICHOST; - hints.ai_family = AF_UNSPEC; - hints.ai_socktype = SOCK_STREAM; - error = getaddrinfo("127.0.0.1", 0, &hints, &ai); - if(error || !ai) - exit(1); /* fail */ - else - exit(0); - - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_run "$LINENO" -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - tst_works_getaddrinfo="yes" - -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - tst_works_getaddrinfo="no" - -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - LD_LIBRARY_PATH=$old # restore - ;; - esac + LD_LIBRARY_PATH=$old # restore fi # @@ -38890,61 +38938,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if getifaddrs seems to work" >&5 printf %s "checking if getifaddrs seems to work... " >&6; } - case $host_os in - darwin*) - if test "$cross_compiling" = yes -then : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run test program while cross compiling -See \`config.log' for more details" "$LINENO" 5; } -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - - $curl_includes_stdlib - $curl_includes_ifaddrs - -int main (void) -{ - - struct ifaddrs *ifa = 0; - int error; - - error = getifaddrs(&ifa); - if(error || !ifa) - exit(1); /* fail */ - else - exit(0); - - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_run "$LINENO" -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - tst_works_getifaddrs="yes" - -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - tst_works_getifaddrs="no" - -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - ;; - *) - old=$LD_LIBRARY_PATH - LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old - export LD_LIBRARY_PATH - if test "$cross_compiling" = yes + old=$LD_LIBRARY_PATH + LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old + export LD_LIBRARY_PATH + if test "$cross_compiling" = yes then : { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} @@ -38991,9 +38988,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi - LD_LIBRARY_PATH=$old # restore - ;; - esac + LD_LIBRARY_PATH=$old # restore fi # @@ -39182,61 +39177,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if gmtime_r seems to work" >&5 printf %s "checking if gmtime_r seems to work... " >&6; } - case $host_os in - darwin*) - if test "$cross_compiling" = yes -then : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run test program while cross compiling -See \`config.log' for more details" "$LINENO" 5; } -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - - $curl_includes_stdlib - $curl_includes_time - -int main (void) -{ - - time_t local = 1170352587; - struct tm *gmt = 0; - struct tm result; - gmt = gmtime_r(&local, &result); - if(gmt) - exit(0); - else - exit(1); - - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_run "$LINENO" -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - tst_works_gmtime_r="yes" - -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - tst_works_gmtime_r="no" - -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - ;; - *) - old=$LD_LIBRARY_PATH - LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old - export LD_LIBRARY_PATH - if test "$cross_compiling" = yes + old=$LD_LIBRARY_PATH + LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old + export LD_LIBRARY_PATH + if test "$cross_compiling" = yes then : { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} @@ -39283,9 +39227,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi - LD_LIBRARY_PATH=$old # restore - ;; - esac + LD_LIBRARY_PATH=$old # restore fi # @@ -39497,9 +39439,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if inet_ntop seems to work" >&5 printf %s "checking if inet_ntop seems to work... " >&6; } - case $host_os in - darwin*) - if test "$cross_compiling" = yes + old=$LD_LIBRARY_PATH + LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old + export LD_LIBRARY_PATH + if test "$cross_compiling" = yes then : { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} @@ -39588,103 +39531,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi - ;; - *) - old=$LD_LIBRARY_PATH - LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old - export LD_LIBRARY_PATH - if test "$cross_compiling" = yes -then : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run test program while cross compiling -See \`config.log' for more details" "$LINENO" 5; } -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - - $curl_includes_stdlib - $curl_includes_arpa_inet - $curl_includes_string - -int main (void) -{ - - char ipv6res[sizeof("ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255")]; - char ipv4res[sizeof "255.255.255.255"]; - unsigned char ipv6a[26]; - unsigned char ipv4a[5]; - char *ipv6ptr = 0; - char *ipv4ptr = 0; - /* - */ - ipv4res[0] = '\0'; - ipv4a[0] = 0xc0; - ipv4a[1] = 0xa8; - ipv4a[2] = 0x64; - ipv4a[3] = 0x01; - ipv4a[4] = 0x01; - /* - */ - ipv4ptr = inet_ntop(AF_INET, ipv4a, ipv4res, sizeof(ipv4res)); - if(!ipv4ptr) - exit(1); /* fail */ - if(ipv4ptr != ipv4res) - exit(1); /* fail */ - if(!ipv4ptr[0]) - exit(1); /* fail */ - if(memcmp(ipv4res, "192.168.100.1", 13) != 0) - exit(1); /* fail */ - /* - */ - ipv6res[0] = '\0'; - memset(ipv6a, 0, sizeof(ipv6a)); - ipv6a[0] = 0xfe; - ipv6a[1] = 0x80; - ipv6a[8] = 0x02; - ipv6a[9] = 0x14; - ipv6a[10] = 0x4f; - ipv6a[11] = 0xff; - ipv6a[12] = 0xfe; - ipv6a[13] = 0x0b; - ipv6a[14] = 0x76; - ipv6a[15] = 0xc8; - ipv6a[25] = 0x01; - /* - */ - ipv6ptr = inet_ntop(AF_INET6, ipv6a, ipv6res, sizeof(ipv6res)); - if(!ipv6ptr) - exit(1); /* fail */ - if(ipv6ptr != ipv6res) - exit(1); /* fail */ - if(!ipv6ptr[0]) - exit(1); /* fail */ - if(memcmp(ipv6res, "fe80::214:4fff:fe0b:76c8", 24) != 0) - exit(1); /* fail */ - /* - */ - exit(0); - - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_run "$LINENO" -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - tst_works_inet_ntop="yes" - -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - tst_works_inet_ntop="no" - -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - LD_LIBRARY_PATH=$old # restore - ;; - esac + LD_LIBRARY_PATH=$old # restore fi # @@ -39846,9 +39693,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if inet_pton seems to work" >&5 printf %s "checking if inet_pton seems to work... " >&6; } - case $host_os in - darwin*) - if test "$cross_compiling" = yes + old=$LD_LIBRARY_PATH + LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old + export LD_LIBRARY_PATH + if test "$cross_compiling" = yes then : { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} @@ -39930,96 +39778,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi - ;; - *) - old=$LD_LIBRARY_PATH - LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old - export LD_LIBRARY_PATH - if test "$cross_compiling" = yes -then : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run test program while cross compiling -See \`config.log' for more details" "$LINENO" 5; } -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - - $curl_includes_stdlib - $curl_includes_arpa_inet - $curl_includes_string - -int main (void) -{ - - unsigned char ipv6a[16+1]; - unsigned char ipv4a[4+1]; - const char *ipv6src = "fe80::214:4fff:fe0b:76c8"; - const char *ipv4src = "192.168.100.1"; - /* - */ - memset(ipv4a, 1, sizeof(ipv4a)); - if(1 != inet_pton(AF_INET, ipv4src, ipv4a)) - exit(1); /* fail */ - /* - */ - if( (ipv4a[0] != 0xc0) || - (ipv4a[1] != 0xa8) || - (ipv4a[2] != 0x64) || - (ipv4a[3] != 0x01) || - (ipv4a[4] != 0x01) ) - exit(1); /* fail */ - /* - */ - memset(ipv6a, 1, sizeof(ipv6a)); - if(1 != inet_pton(AF_INET6, ipv6src, ipv6a)) - exit(1); /* fail */ - /* - */ - if( (ipv6a[0] != 0xfe) || - (ipv6a[1] != 0x80) || - (ipv6a[8] != 0x02) || - (ipv6a[9] != 0x14) || - (ipv6a[10] != 0x4f) || - (ipv6a[11] != 0xff) || - (ipv6a[12] != 0xfe) || - (ipv6a[13] != 0x0b) || - (ipv6a[14] != 0x76) || - (ipv6a[15] != 0xc8) || - (ipv6a[16] != 0x01) ) - exit(1); /* fail */ - /* - */ - if( (ipv6a[2] != 0x0) || - (ipv6a[3] != 0x0) || - (ipv6a[4] != 0x0) || - (ipv6a[5] != 0x0) || - (ipv6a[6] != 0x0) || - (ipv6a[7] != 0x0) ) - exit(1); /* fail */ - /* - */ - exit(0); - - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_run "$LINENO" -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - tst_works_inet_pton="yes" - -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - tst_works_inet_pton="no" - -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - LD_LIBRARY_PATH=$old # restore - ;; - esac + LD_LIBRARY_PATH=$old # restore fi # @@ -40974,61 +40733,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if localtime_r seems to work" >&5 printf %s "checking if localtime_r seems to work... " >&6; } - case $host_os in - darwin*) - if test "$cross_compiling" = yes -then : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run test program while cross compiling -See \`config.log' for more details" "$LINENO" 5; } -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - - $curl_includes_stdlib - $curl_includes_time - -int main (void) -{ - - time_t clock = 1170352587; - struct tm *tmp = 0; - struct tm result; - tmp = localtime_r(&clock, &result); - if(tmp) - exit(0); - else - exit(1); - - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_run "$LINENO" -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - tst_works_localtime_r="yes" - -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - tst_works_localtime_r="no" - -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - ;; - *) - old=$LD_LIBRARY_PATH - LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old - export LD_LIBRARY_PATH - if test "$cross_compiling" = yes + old=$LD_LIBRARY_PATH + LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old + export LD_LIBRARY_PATH + if test "$cross_compiling" = yes then : { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} @@ -41075,9 +40783,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi - LD_LIBRARY_PATH=$old # restore - ;; - esac + LD_LIBRARY_PATH=$old # restore fi # @@ -41426,73 +41132,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if poll seems to work" >&5 printf %s "checking if poll seems to work... " >&6; } - case $host_os in - darwin*) - if test "$cross_compiling" = yes -then : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run test program while cross compiling -See \`config.log' for more details" "$LINENO" 5; } -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - - $curl_includes_stdlib - $curl_includes_poll - $curl_includes_time - -int main (void) -{ - - /* detect the original poll() breakage */ - if(0 != poll(0, 0, 10)) - exit(1); /* fail */ - else { - /* detect the 10.12 poll() breakage */ - struct timeval before, after; - int rc; - size_t us; - - gettimeofday(&before, NULL); - rc = poll(NULL, 0, 500); - gettimeofday(&after, NULL); - - us = (after.tv_sec - before.tv_sec) * 1000000 + - (after.tv_usec - before.tv_usec); - - if(us < 400000) - exit(1); - } - - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_run "$LINENO" -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - tst_works_poll="yes" - -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - tst_works_poll="no" - -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - ;; - *) - old=$LD_LIBRARY_PATH - LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old - export LD_LIBRARY_PATH - if test "$cross_compiling" = yes + old=$LD_LIBRARY_PATH + LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old + export LD_LIBRARY_PATH + if test "$cross_compiling" = yes then : { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} @@ -41551,9 +41194,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi - LD_LIBRARY_PATH=$old # restore - ;; - esac + LD_LIBRARY_PATH=$old # restore fi # @@ -43436,9 +43077,10 @@ printf "%s\n" "yes" >&6; } { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if strerror_r seems to work" >&5 printf %s "checking if strerror_r seems to work... " >&6; } - case $host_os in - darwin*) - if test "$cross_compiling" = yes + old=$LD_LIBRARY_PATH + LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old + export LD_LIBRARY_PATH + if test "$cross_compiling" = yes then : { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} @@ -43488,64 +43130,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi - ;; - *) - old=$LD_LIBRARY_PATH - LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old - export LD_LIBRARY_PATH - if test "$cross_compiling" = yes -then : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run test program while cross compiling -See \`config.log' for more details" "$LINENO" 5; } -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - - $curl_includes_stdlib - $curl_includes_string -# include - -int main (void) -{ - - char buffer[1024]; - char *string = 0; - buffer[0] = '\0'; - string = strerror_r(EACCES, buffer, sizeof(buffer)); - if(!string) - exit(1); /* fail */ - if(!string[0]) - exit(1); /* fail */ - else - exit(0); - - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_run "$LINENO" -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - tst_works_glibc_strerror_r="yes" - -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - tst_works_glibc_strerror_r="no" - -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - LD_LIBRARY_PATH=$old # restore - ;; - esac + LD_LIBRARY_PATH=$old # restore fi # @@ -43602,64 +43187,10 @@ printf "%s\n" "yes" >&6; } { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if strerror_r seems to work" >&5 printf %s "checking if strerror_r seems to work... " >&6; } - case $host_os in - darwin*) - if test "$cross_compiling" = yes -then : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run test program while cross compiling -See \`config.log' for more details" "$LINENO" 5; } -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - - $curl_includes_stdlib - $curl_includes_string -# include - -int main (void) -{ - - char buffer[1024]; - int error = 1; - buffer[0] = '\0'; - error = strerror_r(EACCES, buffer, sizeof(buffer)); - if(error) - exit(1); /* fail */ - if(buffer[0] == '\0') - exit(1); /* fail */ - else - exit(0); - - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_run "$LINENO" -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - tst_works_posix_strerror_r="yes" - -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - tst_works_posix_strerror_r="no" - -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - ;; - *) - old=$LD_LIBRARY_PATH - LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old - export LD_LIBRARY_PATH - if test "$cross_compiling" = yes + old=$LD_LIBRARY_PATH + LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old + export LD_LIBRARY_PATH + if test "$cross_compiling" = yes then : { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} @@ -43709,9 +43240,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi - LD_LIBRARY_PATH=$old # restore - ;; - esac + LD_LIBRARY_PATH=$old # restore fi # @@ -44975,7 +44504,7 @@ fi - for ac_func in fnmatch fchmod geteuid getpass_r getppid getpwuid getpwuid_r getrlimit gettimeofday if_nametoindex mach_absolute_time pipe sched_yield sendmsg setlocale setmode setrlimit usleep utime utimes + for ac_func in fnmatch geteuid getpass_r getppid getpwuid getpwuid_r getrlimit gettimeofday if_nametoindex mach_absolute_time pipe setlocale setmode setrlimit usleep utime utimes do : as_ac_var=`printf "%s\n" "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -45212,12 +44741,16 @@ fi + + # if test "$want_ares" = "yes"; then clean_CPPFLAGS="$CPPFLAGS" clean_LDFLAGS="$LDFLAGS" clean_LIBS="$LIBS" + embedded_ares="unknown" configure_runpath=`pwd` + embedded_ares_builddir="$configure_runpath/ares" if test -n "$want_ares_path"; then ARES_PCDIR="$want_ares_path/lib/pkgconfig" @@ -45390,6 +44923,14 @@ printf "%s\n" "$as_me: pkg-config: ares CPPFLAGS: \"$ares_CPPFLAGS\"" >&6;} ares_LIBS="-lcares" fi else + if test -d "$srcdir/ares"; then + embedded_ares="yes" + subdirs="$subdirs ares" + + ares_CPPFLAGS="" + ares_LDFLAGS="-L$embedded_ares_builddir" + ares_LIBS="-lcares" + else if test -n "$PKG_CONFIG"; then PKGCONFIG="$PKG_CONFIG" @@ -45526,20 +45067,21 @@ printf "%s\n" "found" >&6; } fi fi - if test "$PKGCONFIG" != "no" ; then - ares_LIBS=`$PKGCONFIG --libs-only-l libcares` - ares_LDFLAGS=`$PKGCONFIG --libs-only-L libcares` - ares_CPPFLAGS=`$PKGCONFIG --cflags-only-I libcares` - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: pkg-config: ares_LIBS: \"$ares_LIBS\"" >&5 + if test "$PKGCONFIG" != "no" ; then + ares_LIBS=`$PKGCONFIG --libs-only-l libcares` + ares_LDFLAGS=`$PKGCONFIG --libs-only-L libcares` + ares_CPPFLAGS=`$PKGCONFIG --cflags-only-I libcares` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: pkg-config: ares_LIBS: \"$ares_LIBS\"" >&5 printf "%s\n" "$as_me: pkg-config: ares_LIBS: \"$ares_LIBS\"" >&6;} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: pkg-config: ares_LDFLAGS: \"$ares_LDFLAGS\"" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: pkg-config: ares_LDFLAGS: \"$ares_LDFLAGS\"" >&5 printf "%s\n" "$as_me: pkg-config: ares_LDFLAGS: \"$ares_LDFLAGS\"" >&6;} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: pkg-config: ares_CPPFLAGS: \"$ares_CPPFLAGS\"" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: pkg-config: ares_CPPFLAGS: \"$ares_CPPFLAGS\"" >&5 printf "%s\n" "$as_me: pkg-config: ares_CPPFLAGS: \"$ares_CPPFLAGS\"" >&6;} - else - ares_CPPFLAGS="" - ares_LDFLAGS="" - ares_LIBS="-lcares" + else + ares_CPPFLAGS="" + ares_LDFLAGS="" + ares_LIBS="-lcares" + fi fi fi # @@ -45547,28 +45089,28 @@ printf "%s\n" "$as_me: pkg-config: ares_CPPFLAGS: \"$ares_CPPFLAGS\"" >&6;} LDFLAGS="$clean_LDFLAGS $ares_LDFLAGS" LIBS="$ares_LIBS $clean_LIBS" # - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking that c-ares is good and recent enough" >&5 + if test "$embedded_ares" != "yes"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking that c-ares is good and recent enough" >&5 printf %s "checking that c-ares is good and recent enough... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - /* set of dummy functions in case c-ares was built with debug */ - void curl_dofree() { } - void curl_sclose() { } - void curl_domalloc() { } - void curl_docalloc() { } - void curl_socket() { } + /* set of dummy functions in case c-ares was built with debug */ + void curl_dofree() { } + void curl_sclose() { } + void curl_domalloc() { } + void curl_docalloc() { } + void curl_socket() { } int main (void) { - ares_channel channel; - ares_cancel(channel); /* added in 1.2.0 */ - ares_process_fd(channel, 0, 0); /* added in 1.4.0 */ - ares_dup(&channel, channel); /* added in 1.6.0 */ + ares_channel channel; + ares_cancel(channel); /* added in 1.2.0 */ + ares_process_fd(channel, 0, 0); /* added in 1.4.0 */ + ares_dup(&channel, channel); /* added in 1.6.0 */ ; return 0; @@ -45578,24 +45120,24 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - as_fn_error $? "c-ares library defective or too old" "$LINENO" 5 - CPPFLAGS="$clean_CPPFLAGS" - LDFLAGS="$clean_LDFLAGS" - LIBS="$clean_LIBS" - # prevent usage - want_ares="no" + as_fn_error $? "c-ares library defective or too old" "$LINENO" 5 + CPPFLAGS="$clean_CPPFLAGS" + LDFLAGS="$clean_LDFLAGS" + LIBS="$clean_LIBS" + # prevent usage + want_ares="no" fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - + fi if test "$want_ares" = "yes"; then printf "%s\n" "#define USE_ARES 1" >>confdefs.h @@ -45606,6 +45148,14 @@ printf "%s\n" "#define USE_ARES 1" >>confdefs.h fi fi + if test x$embedded_ares = xyes; then + USE_EMBEDDED_ARES_TRUE= + USE_EMBEDDED_ARES_FALSE='#' +else + USE_EMBEDDED_ARES_TRUE='#' + USE_EMBEDDED_ARES_FALSE= +fi + if test "x$curl_cv_native_windows" != "xyes" && test "x$enable_shared" = "xyes"; then @@ -45717,19 +45267,7 @@ fi if test "$USE_THREADS_POSIX" != "1" then - case $host in - *-ibm-aix*) - COMPILER_VERSION=`"$CC" -qversion 2>/dev/null` - if test x"$COMPILER_VERSION" = "x"; then - CFLAGS="$CFLAGS -pthread" - else - CFLAGS="$CFLAGS -qthreaded" - fi - ;; - *) - CFLAGS="$CFLAGS -pthread" - ;; - esac + CFLAGS="$CFLAGS -pthread" # assign PTHREAD for pkg-config use PTHREAD=" -pthread" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5 @@ -46355,33 +45893,8 @@ printf "%s\n" "yes" >&6; } ;; esac else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - -fi - - -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to support headers-api" >&5 -printf %s "checking whether to support headers-api... " >&6; } -# Check whether --enable-headers-api was given. -if test ${enable_headers_api+y} -then : - enableval=$enable_headers_api; case "$enableval" in - *) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - ;; - no) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - curl_headers_msg="no (--enable-headers-api)" - -printf "%s\n" "#define CURL_DISABLE_HEADERS_API 1" >>confdefs.h - - ;; - esac -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } fi @@ -46610,8 +46123,7 @@ if test "x$USE_NGHTTP2" = "x1" -o "x$USE_HYPER" = "x1"; then SUPPORT_FEATURES="$SUPPORT_FEATURES HTTP2" fi -if test "x$USE_NGTCP2" = "x1" -o "x$USE_QUICHE" = "x1" \ - -o "x$USE_MSH3" = "x1"; then +if test "x$USE_NGTCP2" = "x1" -o "x$USE_QUICHE" = "x1"; then SUPPORT_FEATURES="$SUPPORT_FEATURES HTTP3" fi @@ -46637,36 +46149,6 @@ if test ${ac_cv_sizeof_curl_off_t} -gt 4; then fi fi -if test "$tst_atomic" = "yes"; then - SUPPORT_FEATURES="$SUPPORT_FEATURES threadsafe" -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - - #include - -int main (void) -{ - - #if (WINVER < 0x600) && (_WIN32_WINNT < 0x600) - #error - #endif - - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - - SUPPORT_FEATURES="$SUPPORT_FEATURES threadsafe" - -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - SUPPORT_FEATURES=`echo $SUPPORT_FEATURES | tr ' ' '\012' | sort | tr '\012' ' '` @@ -46949,7 +46431,7 @@ if test "x$want_curldebug_assumed" = "xyes" && ac_configure_args="$ac_configure_args --enable-curldebug" fi -ac_config_files="$ac_config_files Makefile docs/Makefile docs/examples/Makefile docs/libcurl/Makefile docs/libcurl/opts/Makefile docs/cmdline-opts/Makefile include/Makefile include/curl/Makefile src/Makefile lib/Makefile scripts/Makefile lib/libcurl.vers lib/libcurl.plist tests/Makefile tests/certs/Makefile tests/certs/scripts/Makefile tests/data/Makefile tests/server/Makefile tests/libtest/Makefile tests/unit/Makefile packages/Makefile packages/vms/Makefile curl-config libcurl.pc" +ac_config_files="$ac_config_files Makefile docs/Makefile docs/examples/Makefile docs/libcurl/Makefile docs/libcurl/opts/Makefile docs/cmdline-opts/Makefile include/Makefile include/curl/Makefile src/Makefile lib/Makefile scripts/Makefile lib/libcurl.vers tests/Makefile tests/certs/Makefile tests/certs/scripts/Makefile tests/data/Makefile tests/server/Makefile tests/libtest/Makefile tests/unit/Makefile packages/Makefile packages/vms/Makefile curl-config libcurl.pc" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -47144,6 +46626,10 @@ if test -z "${USE_MANUAL_TRUE}" && test -z "${USE_MANUAL_FALSE}"; then as_fn_error $? "conditional \"USE_MANUAL\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${USE_EMBEDDED_ARES_TRUE}" && test -z "${USE_EMBEDDED_ARES_FALSE}"; then + as_fn_error $? "conditional \"USE_EMBEDDED_ARES\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${BUILD_LIBHOSTNAME_TRUE}" && test -z "${BUILD_LIBHOSTNAME_FALSE}"; then as_fn_error $? "conditional \"BUILD_LIBHOSTNAME\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -47772,14 +47258,12 @@ lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_q lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' -FILECMD='`$ECHO "$FILECMD" | $SED "$delay_single_quote_subst"`' deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' -lt_ar_flags='`$ECHO "$lt_ar_flags" | $SED "$delay_single_quote_subst"`' AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' @@ -47903,13 +47387,13 @@ LN_S \ lt_SP2NL \ lt_NL2SP \ reload_flag \ -FILECMD \ deplibs_check_method \ file_magic_cmd \ file_magic_glob \ want_nocaseglob \ sharedlib_from_linklib_cmd \ AR \ +AR_FLAGS \ archiver_list_spec \ STRIP \ RANLIB \ @@ -48037,7 +47521,6 @@ do "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;; "scripts/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;; "lib/libcurl.vers") CONFIG_FILES="$CONFIG_FILES lib/libcurl.vers" ;; - "lib/libcurl.plist") CONFIG_FILES="$CONFIG_FILES lib/libcurl.plist" ;; "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;; "tests/certs/Makefile") CONFIG_FILES="$CONFIG_FILES tests/certs/Makefile" ;; "tests/certs/scripts/Makefile") CONFIG_FILES="$CONFIG_FILES tests/certs/scripts/Makefile" ;; @@ -48883,9 +48366,6 @@ to_host_file_cmd=$lt_cv_to_host_file_cmd # convert \$build files to toolchain format. to_tool_file_cmd=$lt_cv_to_tool_file_cmd -# A file(cmd) program that detects file types. -FILECMD=$lt_FILECMD - # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -48904,11 +48384,8 @@ sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd # The archiver. AR=$lt_AR -# Flags to create an archive (by configure). -lt_ar_flags=$lt_ar_flags - # Flags to create an archive. -AR_FLAGS=\${ARFLAGS-"\$lt_ar_flags"} +AR_FLAGS=$lt_AR_FLAGS # How to feed a file listing to the archiver. archiver_list_spec=$lt_archiver_list_spec @@ -49284,7 +48761,7 @@ ltmain=$ac_aux_dir/ltmain.sh # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? - $SED '$q' "$ltmain" >> "$cfgfile" \ + sed '$q' "$ltmain" >> "$cfgfile" \ || (rm -f "$cfgfile"; exit 1) mv -f "$cfgfile" "$ofile" || @@ -49325,6 +48802,149 @@ if test "$no_create" != yes; then # would make configure fail if this is the last instruction. $ac_cs_success || as_fn_exit 1 fi + +# +# CONFIG_SUBDIRS section. +# +if test "$no_recursion" != yes; then + + # Remove --cache-file, --srcdir, and --disable-option-checking arguments + # so they do not pile up. + ac_sub_configure_args= + ac_prev= + eval "set x $ac_configure_args" + shift + for ac_arg + do + if test -n "$ac_prev"; then + ac_prev= + continue + fi + case $ac_arg in + -cache-file | --cache-file | --cache-fil | --cache-fi \ + | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) + ac_prev=cache_file ;; + -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ + | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* \ + | --c=*) + ;; + --config-cache | -C) + ;; + -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) + ac_prev=srcdir ;; + -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) + ;; + -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) + ac_prev=prefix ;; + -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) + ;; + --disable-option-checking) + ;; + *) + case $ac_arg in + *\'*) ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + as_fn_append ac_sub_configure_args " '$ac_arg'" ;; + esac + done + + # Always prepend --prefix to ensure using the same prefix + # in subdir configurations. + ac_arg="--prefix=$prefix" + case $ac_arg in + *\'*) ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + ac_sub_configure_args="'$ac_arg' $ac_sub_configure_args" + + # Pass --silent + if test "$silent" = yes; then + ac_sub_configure_args="--silent $ac_sub_configure_args" + fi + + # Always prepend --disable-option-checking to silence warnings, since + # different subdirs can have different --enable and --with options. + ac_sub_configure_args="--disable-option-checking $ac_sub_configure_args" + + ac_popdir=`pwd` + for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue + + # Do not complain, so a configure script can configure whichever + # parts of a large source tree are present. + test -d "$srcdir/$ac_dir" || continue + + ac_msg="=== configuring in $ac_dir (`pwd`/$ac_dir)" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_msg" >&5 + printf "%s\n" "$ac_msg" >&6 + as_dir="$ac_dir"; as_fn_mkdir_p + ac_builddir=. + +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) + ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix + +case $srcdir in + .) # We are building in place. + ac_srcdir=. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; +esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + + + cd "$ac_dir" + + # Check for configure.gnu first; this name is used for a wrapper for + # Metaconfig's "Configure" on case-insensitive file systems. + if test -f "$ac_srcdir/configure.gnu"; then + ac_sub_configure=$ac_srcdir/configure.gnu + elif test -f "$ac_srcdir/configure"; then + ac_sub_configure=$ac_srcdir/configure + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: no configuration information is in $ac_dir" >&5 +printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2;} + ac_sub_configure= + fi + + # The recursion is here. + if test -n "$ac_sub_configure"; then + # Make the cache file name correct relative to the subdirectory. + case $cache_file in + [\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;; + *) # Relative name. + ac_sub_cache_file=$ac_top_build_prefix$cache_file ;; + esac + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5 +printf "%s\n" "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;} + # The eval makes quoting arguments work. + eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \ + --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" || + as_fn_error $? "$ac_sub_configure failed for $ac_dir" "$LINENO" 5 + fi + + cd "$ac_popdir" + done +fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} @@ -49506,7 +49126,6 @@ done RTMP: ${curl_rtmp_msg} PSL: ${curl_psl_msg} Alt-svc: ${curl_altsvc_msg} - Headers API: ${curl_headers_msg} HSTS: ${curl_hsts_msg} HTTP1: ${curl_h1_msg} HTTP2: ${curl_h2_msg} @@ -49553,7 +49172,6 @@ printf "%s\n" "$as_me: Configured to build curl/libcurl: RTMP: ${curl_rtmp_msg} PSL: ${curl_psl_msg} Alt-svc: ${curl_altsvc_msg} - Headers API: ${curl_headers_msg} HSTS: ${curl_hsts_msg} HTTP1: ${curl_h1_msg} HTTP2: ${curl_h2_msg} diff --git a/3rdparty/curl-7.84.0/configure.ac b/3rdparty/curl-7.80.0/configure.ac similarity index 93% rename from 3rdparty/curl-7.84.0/configure.ac rename to 3rdparty/curl-7.80.0/configure.ac index de2dee5a..0c238470 100644 --- a/3rdparty/curl-7.84.0/configure.ac +++ b/3rdparty/curl-7.80.0/configure.ac @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2021, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,8 +18,6 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # -# SPDX-License-Identifier: curl -# #*************************************************************************** dnl Process this file with autoconf to produce a configure script. @@ -33,7 +31,7 @@ XC_OVR_ZZ60 CURL_OVERRIDE_AUTOCONF dnl configure script copyright -AC_COPYRIGHT([Copyright (c) 1998 - 2022 Daniel Stenberg, +AC_COPYRIGHT([Copyright (c) 1998 - 2021 Daniel Stenberg, This configure script may be copied, distributed and modified under the terms of the curl license; see COPYING for more details]) @@ -120,7 +118,6 @@ AC_SUBST(libext) dnl figure out the libcurl version CURLVERSION=`$SED -ne 's/^#define LIBCURL_VERSION "\(.*\)".*/\1/p' ${srcdir}/include/curl/curlver.h` XC_CHECK_PROG_CC -CURL_ATOMIC dnl for --enable-code-coverage CURL_COVERAGE @@ -146,7 +143,7 @@ AC_SUBST(PKGADD_VENDOR) dnl dnl initialize all the info variables - curl_ssl_msg="no (--with-{openssl,gnutls,nss,mbedtls,wolfssl,schannel,secure-transport,amissl,bearssl,rustls} )" + curl_ssl_msg="no (--with-{openssl,gnutls,nss,mbedtls,wolfssl,schannel,secure-transport,mesalink,amissl,bearssl,rustls} )" curl_ssh_msg="no (--with-{libssh,libssh2})" curl_zlib_msg="no (--with-zlib)" curl_brotli_msg="no (--with-brotli)" @@ -168,12 +165,11 @@ curl_verbose_msg="enabled (--disable-verbose)" curl_rtmp_msg="no (--with-librtmp)" curl_psl_msg="no (--with-libpsl)" curl_altsvc_msg="enabled (--disable-alt-svc)" -curl_headers_msg="enabled (--disable-headers-api)" curl_hsts_msg="enabled (--disable-hsts)" ssl_backends= curl_h1_msg="enabled (internal)" curl_h2_msg="no (--with-nghttp2, --with-hyper)" - curl_h3_msg="no (--with-ngtcp2, --with-quiche --with-msh3)" + curl_h3_msg="no (--with-ngtcp2, --with-quiche)" enable_altsvc="yes" hsts="yes" @@ -215,79 +211,54 @@ AS_HELP_STRING([--with-ssl=PATH],[old version of --with-openssl]) AS_HELP_STRING([--without-ssl], [build without any TLS library]), OPT_SSL=$withval OPT_OPENSSL=$withval - if test X"$withval" != Xno; then - test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }OpenSSL") - fi + test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }OpenSSL") AC_ARG_WITH(openssl,dnl AS_HELP_STRING([--with-openssl=PATH],[Where to look for OpenSSL, PATH points to the SSL installation (default: /usr/local/ssl); when possible, set the PKG_CONFIG_PATH environment variable instead of using this option]), OPT_OPENSSL=$withval - if test X"$withval" != Xno; then - test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }OpenSSL") - fi + test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }OpenSSL") OPT_GNUTLS=no AC_ARG_WITH(gnutls,dnl AS_HELP_STRING([--with-gnutls=PATH],[where to look for GnuTLS, PATH points to the installation root]), OPT_GNUTLS=$withval - if test X"$withval" != Xno; then - test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }GnuTLS") - fi + test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }GnuTLS") OPT_MBEDTLS=no AC_ARG_WITH(mbedtls,dnl AS_HELP_STRING([--with-mbedtls=PATH],[where to look for mbedTLS, PATH points to the installation root]), OPT_MBEDTLS=$withval - if test X"$withval" != Xno; then - test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }mbedTLS") - fi + test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }mbedTLS") OPT_WOLFSSL=no AC_ARG_WITH(wolfssl,dnl AS_HELP_STRING([--with-wolfssl=PATH],[where to look for WolfSSL, PATH points to the installation root (default: system lib default)]), OPT_WOLFSSL=$withval - if test X"$withval" != Xno; then - test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }wolfSSL") - fi + test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }wolfSSL") + +OPT_MESALINK=no +AC_ARG_WITH(mesalink,dnl +AS_HELP_STRING([--with-mesalink=PATH],[where to look for MesaLink, PATH points to the installation root]), + OPT_MESALINK=$withval + test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }MesaLink") OPT_BEARSSL=no AC_ARG_WITH(bearssl,dnl AS_HELP_STRING([--with-bearssl=PATH],[where to look for BearSSL, PATH points to the installation root]), OPT_BEARSSL=$withval - if test X"$withval" != Xno; then - test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }BearSSL") - fi + test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }BearSSL") OPT_RUSTLS=no AC_ARG_WITH(rustls,dnl AS_HELP_STRING([--with-rustls=PATH],[where to look for rustls, PATH points to the installation root]), OPT_RUSTLS=$withval - if test X"$withval" != Xno; then - test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }rustls") - experimental="$experimental rustls" - fi - -OPT_NSS_AWARE=no -AC_ARG_WITH(nss-deprecated,dnl -AS_HELP_STRING([--with-nss-deprecated],[confirm you realize NSS is going away]), - if test X"$withval" != Xno; then - OPT_NSS_AWARE=$withval - fi -) + test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }rustls") OPT_NSS=no AC_ARG_WITH(nss,dnl AS_HELP_STRING([--with-nss=PATH],[where to look for NSS, PATH points to the installation root]), OPT_NSS=$withval - if test X"$withval" != Xno; then - - if test X"$OPT_NSS_AWARE" = "Xno" ; then - AC_MSG_ERROR([NSS use must be confirmed using --with-nss-deprecated. NSS support will be dropped from curl in August 2022. See docs/DEPRECATE.md]) - fi - - test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }NSS" - fi -) + test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }NSS") dnl If no TLS choice has been made, check if it was explicitly disabled or dnl error out to force the user to decide. @@ -301,6 +272,7 @@ Select from these: --with-bearssl --with-gnutls --with-mbedtls + --with-mesalink --with-nss --with-openssl (also works for BoringSSL and libressl) --with-rustls @@ -700,7 +672,7 @@ if test X"$want_hyper" != Xno; then LIB_HYPER="-lhyper -ldl -lpthread -lm" if test X"$want_hyper" != Xdefault; then CPP_HYPER=-I"$want_hyper_path/capi/include" - LD_HYPER="-L$want_hyper_path/target/release -L$want_hyper_path/target/debug" + LD_HYPER="-L$want_hyper_path/target/debug" fi fi if test -n "$LIB_HYPER"; then @@ -713,8 +685,7 @@ if test X"$want_hyper" != Xno; then LIBS="$LIB_HYPER $LIBS" if test "x$cross_compiling" != "xyes"; then - dnl remove -L, separate with colon if more than one - DIR_HYPER=`echo $LD_HYPER | $SED -e 's/^-L//' -e 's/ -L/:/g'` + DIR_HYPER=`echo $LD_HYPER | $SED -e 's/^-L//'` fi AC_CHECK_LIB(hyper, hyper_io_new, @@ -732,11 +703,6 @@ if test X"$want_hyper" != Xno; then AC_MSG_NOTICE([Added $DIR_HYPER to CURL_LIBRARY_PATH]), ) ], - for d in `echo $DIR_HYPER | $SED -e 's/:/ /'`; do - if test -f "$d/libhyper.a"; then - AC_MSG_ERROR([hyper was found in $d but was probably built with wrong flags. See docs/HYPER.md.]) - fi - done AC_MSG_ERROR([--with-hyper but hyper was not found. See docs/HYPER.md.]) ) fi @@ -1156,6 +1122,16 @@ then ]) fi +if test "$HAVE_GETHOSTBYNAME" != "1" +then + dnl gethostbyname in the net lib - for BeOS + AC_CHECK_LIB(net, gethostbyname, + [HAVE_GETHOSTBYNAME="1" + LIBS="-lnet $LIBS" + ]) +fi + + if test "$HAVE_GETHOSTBYNAME" != "1"; then AC_MSG_ERROR([couldn't find libraries for gethostbyname()]) fi @@ -1701,25 +1677,17 @@ AC_ARG_WITH(gssapi, fi ]) -: ${KRB5CONFIG:="$GSSAPI_ROOT/bin/krb5-config"} - save_CPPFLAGS="$CPPFLAGS" AC_MSG_CHECKING([if GSS-API support is requested]) if test x"$want_gss" = xyes; then AC_MSG_RESULT(yes) - if test $GSSAPI_ROOT != "/usr"; then - CURL_CHECK_PKGCONFIG(mit-krb5-gssapi, $GSSAPI_ROOT/lib/pkgconfig) - else - CURL_CHECK_PKGCONFIG(mit-krb5-gssapi) - fi + CURL_CHECK_PKGCONFIG(mit-krb5-gssapi) if test -z "$GSSAPI_INCS"; then if test -n "$host_alias" -a -f "$GSSAPI_ROOT/bin/$host_alias-krb5-config"; then GSSAPI_INCS=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --cflags gssapi` elif test "$PKGCONFIG" != "no" ; then GSSAPI_INCS=`$PKGCONFIG --cflags mit-krb5-gssapi` - elif test -f "$KRB5CONFIG"; then - GSSAPI_INCS=`$KRB5CONFIG --cflags gssapi` elif test "$GSSAPI_ROOT" != "yes"; then GSSAPI_INCS="-I$GSSAPI_ROOT/include" fi @@ -1804,11 +1772,7 @@ if test x"$want_gss" = xyes; then LIBS="-lgssapi_krb5 -lresolv $LIBS" ;; *) - if test $GSSAPI_ROOT != "/usr"; then - CURL_CHECK_PKGCONFIG(mit-krb5-gssapi, $GSSAPI_ROOT/lib/pkgconfig) - else - CURL_CHECK_PKGCONFIG(mit-krb5-gssapi) - fi + CURL_CHECK_PKGCONFIG(mit-krb5-gssapi) if test -n "$host_alias" -a -f "$GSSAPI_ROOT/bin/$host_alias-krb5-config"; then dnl krb5-config doesn't have --libs-only-L or similar, put everything dnl into LIBS @@ -1817,11 +1781,6 @@ if test x"$want_gss" = xyes; then elif test "$PKGCONFIG" != "no" ; then gss_libs=`$PKGCONFIG --libs mit-krb5-gssapi` LIBS="$gss_libs $LIBS" - elif test -f "$KRB5CONFIG"; then - dnl krb5-config doesn't have --libs-only-L or similar, put everything - dnl into LIBS - gss_libs=`$KRB5CONFIG --libs gssapi` - LIBS="$gss_libs $LIBS" else case $host in *-hp-hpux*) @@ -1856,18 +1815,6 @@ else CPPFLAGS="$save_CPPFLAGS" fi -if test x"$want_gss" = xyes; then - AC_MSG_CHECKING([if we can link against GSS-API library]) - AC_LINK_IFELSE([ - AC_LANG_FUNC_LINK_TRY([gss_init_sec_context]) - ],[ - AC_MSG_RESULT([yes]) - ],[ - AC_MSG_RESULT([no]) - AC_MSG_ERROR([--with-gssapi was specified, but a GSS-API library was not found.]) - ]) -fi - build_libstubgss=no if test x"$want_gss" = "xyes"; then build_libstubgss=yes @@ -1908,6 +1855,7 @@ CURL_WITH_OPENSSL CURL_WITH_GNUTLS CURL_WITH_MBEDTLS CURL_WITH_WOLFSSL +CURL_WITH_MESALINK CURL_WITH_BEARSSL CURL_WITH_RUSTLS CURL_WITH_NSS @@ -1917,11 +1865,11 @@ if test "x$USE_WIN32_CRYPTO" = "x1" -o "x$USE_SCHANNEL" = "x1"; then LIBS="-ladvapi32 -lcrypt32 $LIBS" fi -case "x$OPENSSL_ENABLED$GNUTLS_ENABLED$NSS_ENABLED$MBEDTLS_ENABLED$WOLFSSL_ENABLED$SCHANNEL_ENABLED$SECURETRANSPORT_ENABLED$BEARSSL_ENABLED$AMISSL_ENABLED$RUSTLS_ENABLED" +case "x$OPENSSL_ENABLED$GNUTLS_ENABLED$NSS_ENABLED$MBEDTLS_ENABLED$WOLFSSL_ENABLED$SCHANNEL_ENABLED$SECURETRANSPORT_ENABLED$MESALINK_ENABLED$BEARSSL_ENABLED$AMISSL_ENABLED$RUSTLS_ENABLED" in x) AC_MSG_WARN([SSL disabled, you will not be able to use HTTPS, FTPS, NTLM and more.]) - AC_MSG_WARN([Use --with-openssl, --with-gnutls, --with-wolfssl, --with-mbedtls, --with-nss, --with-schannel, --with-secure-transport, --with-amissl, --with-bearssl or --with-rustls to address this.]) + AC_MSG_WARN([Use --with-openssl, --with-gnutls, --with-wolfssl, --with-mbedtls, --with-nss, --with-schannel, --with-secure-transport, --with-mesalink, --with-amissl, --with-bearssl or --with-rustls to address this.]) ;; x1) # one SSL backend is enabled @@ -2337,10 +2285,6 @@ AC_SUBST([CURL_LT_SHLIB_VERSIONED_FLAVOUR], AM_CONDITIONAL([CURL_LT_SHLIB_USE_VERSIONED_SYMBOLS], [test "x$versioned_symbols" = 'xyes']) -dnl Update .plist file with current version -AC_SUBST([CURL_PLIST_VERSION], - ["$CURLVERSION"]) - dnl ------------------------------------------------- dnl check winidn option before other IDN libraries dnl ------------------------------------------------- @@ -2449,36 +2393,31 @@ AC_ARG_WITH(libidn2, AS_HELP_STRING([--with-libidn2=PATH],[Enable libidn2 usage]) AS_HELP_STRING([--without-libidn2],[Disable libidn2 usage]), [OPT_IDN=$withval]) -if test "x$tst_links_winidn" = "xyes"; then - want_idn="no" - AC_MSG_RESULT([no (using winidn instead)]) -else - case "$OPT_IDN" in - no) - dnl --without-libidn2 option used - want_idn="no" - AC_MSG_RESULT([no]) - ;; - default) - dnl configure option not specified - want_idn="yes" - want_idn_path="default" - AC_MSG_RESULT([(assumed) yes]) - ;; - yes) - dnl --with-libidn2 option used without path - want_idn="yes" - want_idn_path="default" - AC_MSG_RESULT([yes]) - ;; - *) - dnl --with-libidn2 option used with path - want_idn="yes" - want_idn_path="$withval" - AC_MSG_RESULT([yes ($withval)]) - ;; - esac -fi +case "$OPT_IDN" in + no) + dnl --without-libidn2 option used + want_idn="no" + AC_MSG_RESULT([no]) + ;; + default) + dnl configure option not specified + want_idn="yes" + want_idn_path="default" + AC_MSG_RESULT([(assumed) yes]) + ;; + yes) + dnl --with-libidn2 option used without path + want_idn="yes" + want_idn_path="default" + AC_MSG_RESULT([yes]) + ;; + *) + dnl --with-libidn2 option used with path + want_idn="yes" + want_idn_path="$withval" + AC_MSG_RESULT([yes ($withval)]) + ;; +esac if test "$want_idn" = "yes"; then dnl idn library support has been requested @@ -2592,13 +2531,11 @@ case "$OPT_H2" in dnl --with-nghttp2 option used without path want_nghttp2="default" want_nghttp2_path="" - want_nghttp2_pkg_config_path="" ;; *) dnl --with-nghttp2 option used with path want_nghttp2="yes" - want_nghttp2_path="$withval" - want_nghttp2_pkg_config_path="$withval/lib/pkgconfig" + want_nghttp2_path="$withval/lib/pkgconfig" ;; esac @@ -2608,57 +2545,51 @@ if test X"$want_nghttp2" != Xno; then CLEANCPPFLAGS="$CPPFLAGS" CLEANLIBS="$LIBS" - CURL_CHECK_PKGCONFIG(libnghttp2, $want_nghttp2_pkg_config_path) + CURL_CHECK_PKGCONFIG(libnghttp2, $want_nghttp2_path) if test "$PKGCONFIG" != "no" ; then - LIB_H2=`CURL_EXPORT_PCDIR([$want_nghttp2_pkg_config_path]) + LIB_H2=`CURL_EXPORT_PCDIR([$want_nghttp2_path]) $PKGCONFIG --libs-only-l libnghttp2` AC_MSG_NOTICE([-l is $LIB_H2]) - CPP_H2=`CURL_EXPORT_PCDIR([$want_nghttp2_pkg_config_path]) dnl + CPP_H2=`CURL_EXPORT_PCDIR([$want_nghttp2_path]) dnl $PKGCONFIG --cflags-only-I libnghttp2` AC_MSG_NOTICE([-I is $CPP_H2]) - LD_H2=`CURL_EXPORT_PCDIR([$want_nghttp2_pkg_config_path]) + LD_H2=`CURL_EXPORT_PCDIR([$want_nghttp2_path]) $PKGCONFIG --libs-only-L libnghttp2` AC_MSG_NOTICE([-L is $LD_H2]) - DIR_H2=`echo $LD_H2 | $SED -e 's/^-L//'` - elif test x"$want_nghttp2_path" != x; then - LIB_H2="-lnghttp2" - LD_H2=-L${want_nghttp2_path}/lib$libsuff - CPP_H2=-I${want_nghttp2_path}/include - DIR_H2=${want_nghttp2_path}/lib$libsuff - elif test X"$want_nghttp2" != Xdefault; then - dnl no nghttp2 pkg-config found and no custom directory specified, - dnl deal with it - AC_MSG_ERROR([--with-nghttp2 was specified but could not find libnghttp2 pkg-config file.]) - fi + LDFLAGS="$LDFLAGS $LD_H2" + CPPFLAGS="$CPPFLAGS $CPP_H2" + LIBS="$LIB_H2 $LIBS" - LDFLAGS="$LDFLAGS $LD_H2" - CPPFLAGS="$CPPFLAGS $CPP_H2" - LIBS="$LIB_H2 $LIBS" + # use nghttp2_session_set_local_window_size to require nghttp2 + # >= 1.12.0 + AC_CHECK_LIB(nghttp2, nghttp2_session_set_local_window_size, + [ + AC_CHECK_HEADERS(nghttp2/nghttp2.h, + curl_h2_msg="enabled (nghttp2)" + NGHTTP2_ENABLED=1 + AC_DEFINE(USE_NGHTTP2, 1, [if nghttp2 is in use]) + AC_SUBST(USE_NGHTTP2, [1]) + ) + ], + dnl not found, revert back to clean variables + LDFLAGS=$CLEANLDFLAGS + CPPFLAGS=$CLEANCPPFLAGS + LIBS=$CLEANLIBS + ) - # use nghttp2_session_set_local_window_size to require nghttp2 - # >= 1.12.0 - AC_CHECK_LIB(nghttp2, nghttp2_session_set_local_window_size, - [ - AC_CHECK_HEADERS(nghttp2/nghttp2.h, - curl_h2_msg="enabled (nghttp2)" - NGHTTP2_ENABLED=1 - AC_DEFINE(USE_NGHTTP2, 1, [if nghttp2 is in use]) - AC_SUBST(USE_NGHTTP2, [1]) - ) + else + dnl no nghttp2 pkg-config found, deal with it + if test X"$want_nghttp2" != Xdefault; then + dnl To avoid link errors, we do not allow --with-nghttp2 without + dnl a pkgconfig file + AC_MSG_ERROR([--with-nghttp2 was specified but could not find libnghttp2 pkg-config file.]) + fi + fi - CURL_LIBRARY_PATH="$CURL_LIBRARY_PATH:$DIR_H2" - export CURL_LIBRARY_PATH - AC_MSG_NOTICE([Added $DIR_H2 to CURL_LIBRARY_PATH]) - ], - dnl not found, revert back to clean variables - LDFLAGS=$CLEANLDFLAGS - CPPFLAGS=$CLEANCPPFLAGS - LIBS=$CLEANLIBS - ) fi dnl ********************************************************************** @@ -2778,7 +2709,7 @@ if test "x$NGTCP2_ENABLED" = "x1" -a "x$OPENSSL_ENABLED" = "x1"; then if test "x$cross_compiling" != "xyes"; then DIR_NGTCP2_CRYPTO_OPENSSL=`echo $LD_NGTCP2_CRYPTO_OPENSSL | $SED -e 's/^-L//'` fi - AC_CHECK_LIB(ngtcp2_crypto_openssl, ngtcp2_crypto_recv_client_initial_cb, + AC_CHECK_LIB(ngtcp2_crypto_openssl, ngtcp2_crypto_ctx_initial, [ AC_CHECK_HEADERS(ngtcp2/ngtcp2_crypto.h, NGTCP2_ENABLED=1 @@ -2833,7 +2764,7 @@ if test "x$NGTCP2_ENABLED" = "x1" -a "x$GNUTLS_ENABLED" = "x1"; then if test "x$cross_compiling" != "xyes"; then DIR_NGTCP2_CRYPTO_GNUTLS=`echo $LD_NGTCP2_CRYPTO_GNUTLS | $SED -e 's/^-L//'` fi - AC_CHECK_LIB(ngtcp2_crypto_gnutls, ngtcp2_crypto_recv_client_initial_cb, + AC_CHECK_LIB(ngtcp2_crypto_gnutls, ngtcp2_crypto_ctx_initial, [ AC_CHECK_HEADERS(ngtcp2/ngtcp2_crypto.h, NGTCP2_ENABLED=1 @@ -3049,78 +2980,6 @@ AC_INCLUDES_DEFAULT fi fi -dnl ********************************************************************** -dnl Check for msh3 (QUIC) -dnl ********************************************************************** - -OPT_MSH3="no" - -if test "x$disable_http" = "xyes" -o "x$USE_NGTCP" = "x1"; then - # without HTTP or with ngtcp2, msh3 is no use - OPT_MSH3="no" -fi - -AC_ARG_WITH(msh3, -AS_HELP_STRING([--with-msh3=PATH],[Enable msh3 usage]) -AS_HELP_STRING([--without-msh3],[Disable msh3 usage]), - [OPT_MSH3=$withval]) -case "$OPT_MSH3" in - no) - dnl --without-msh3 option used - want_msh3="no" - ;; - yes) - dnl --with-msh3 option used without path - want_msh3="default" - want_msh3_path="" - ;; - *) - dnl --with-msh3 option used with path - want_msh3="yes" - want_msh3_path="$withval" - ;; -esac - -if test X"$want_msh3" != Xno; then - - if test "$NGHTTP3_ENABLED" = 1; then - AC_MSG_ERROR([--with-msh3 and --with-ngtcp2 are mutually exclusive]) - fi - - dnl backup the pre-msh3 variables - CLEANLDFLAGS="$LDFLAGS" - CLEANCPPFLAGS="$CPPFLAGS" - CLEANLIBS="$LIBS" - - if test -n "$want_msh3_path"; then - LD_MSH3="-L$want_msh3_path/lib" - CPP_MSH3="-I$want_msh3_path/include" - DIR_MSH3="$want_msh3_path/lib" - LDFLAGS="$LDFLAGS $LD_MSH3" - CPPFLAGS="$CPPFLAGS $CPP_MSH3" - fi - LIBS="-lmsh3 $LIBS" - - AC_CHECK_LIB(msh3, MsH3ApiOpen, - [ - AC_CHECK_HEADERS(msh3.h, - curl_h3_msg="enabled (msh3)" - MSH3_ENABLED=1 - AC_DEFINE(USE_MSH3, 1, [if msh3 is in use]) - AC_SUBST(USE_MSH3, [1]) - CURL_LIBRARY_PATH="$CURL_LIBRARY_PATH:$DIR_MSH3" - export CURL_LIBRARY_PATH - AC_MSG_NOTICE([Added $DIR_MSH3 to CURL_LIBRARY_PATH]), - experimental="$experimental HTTP3" - ) - ], - dnl not found, revert back to clean variables - LDFLAGS=$CLEANLDFLAGS - CPPFLAGS=$CLEANCPPFLAGS - LIBS=$CLEANLIBS - ) -fi - dnl ********************************************************************** dnl Check for zsh completion path dnl ********************************************************************** @@ -3198,7 +3057,6 @@ AC_CHECK_HEADERS( sys/un.h \ linux/tcp.h \ netinet/tcp.h \ - netinet/udp.h \ netdb.h \ sys/sockio.h \ sys/stat.h \ @@ -3438,7 +3296,6 @@ AC_CHECK_DECLS([getpwuid_r], [], [AC_DEFINE(HAVE_DECL_GETPWUID_R_MISSING, 1, "Se AC_CHECK_FUNCS([fnmatch \ - fchmod \ geteuid \ getpass_r \ getppid \ @@ -3449,8 +3306,6 @@ AC_CHECK_FUNCS([fnmatch \ if_nametoindex \ mach_absolute_time \ pipe \ - sched_yield \ - sendmsg \ setlocale \ setmode \ setrlimit \ @@ -3536,6 +3391,7 @@ dnl set variable for use in automakefile(s) AM_CONDITIONAL(USE_MANUAL, test x"$USE_MANUAL" = x1) CURL_CHECK_LIB_ARES +AM_CONDITIONAL(USE_EMBEDDED_ARES, test x$embedded_ares = xyes) if test "x$curl_cv_native_windows" != "xyes" && test "x$enable_shared" = "xyes"; then @@ -3619,20 +3475,7 @@ if test "$want_pthreads" != "no"; then dnl if it wasn't found without lib, search for it in pthread lib if test "$USE_THREADS_POSIX" != "1" then - case $host in - *-ibm-aix*) - dnl Check if compiler is xlC - COMPILER_VERSION=`"$CC" -qversion 2>/dev/null` - if test x"$COMPILER_VERSION" = "x"; then - CFLAGS="$CFLAGS -pthread" - else - CFLAGS="$CFLAGS -qthreaded" - fi - ;; - *) - CFLAGS="$CFLAGS -pthread" - ;; - esac + CFLAGS="$CFLAGS -pthread" # assign PTHREAD for pkg-config use PTHREAD=" -pthread" AC_CHECK_LIB(pthread, pthread_create, @@ -4018,26 +3861,7 @@ AS_HELP_STRING([--disable-alt-svc],[Disable alt-svc support]), *) AC_MSG_RESULT(yes) ;; esac ], - AC_MSG_RESULT(yes) -) - -dnl ************************************************************ -dnl switch on/off headers-api -dnl -AC_MSG_CHECKING([whether to support headers-api]) -AC_ARG_ENABLE(headers-api, -AS_HELP_STRING([--enable-headers-api],[Enable headers-api support]) -AS_HELP_STRING([--disable-headers-api],[Disable headers-api support]), -[ case "$enableval" in - *) - AC_MSG_RESULT(yes) - ;; - no) AC_MSG_RESULT(no) - curl_headers_msg="no (--enable-headers-api)" - AC_DEFINE(CURL_DISABLE_HEADERS_API, 1, [disable headers-api]) - ;; - esac ], - AC_MSG_RESULT(yes) + AC_MSG_RESULT(no) ) dnl only check for HSTS if there's SSL present @@ -4235,8 +4059,7 @@ if test "x$USE_NGHTTP2" = "x1" -o "x$USE_HYPER" = "x1"; then SUPPORT_FEATURES="$SUPPORT_FEATURES HTTP2" fi -if test "x$USE_NGTCP2" = "x1" -o "x$USE_QUICHE" = "x1" \ - -o "x$USE_MSH3" = "x1"; then +if test "x$USE_NGTCP2" = "x1" -o "x$USE_QUICHE" = "x1"; then SUPPORT_FEATURES="$SUPPORT_FEATURES HTTP3" fi @@ -4263,23 +4086,6 @@ if test ${ac_cv_sizeof_curl_off_t} -gt 4; then fi fi -if test "$tst_atomic" = "yes"; then - SUPPORT_FEATURES="$SUPPORT_FEATURES threadsafe" -else - AC_COMPILE_IFELSE([ - AC_LANG_PROGRAM([[ - #include - ]],[[ - #if (WINVER < 0x600) && (_WIN32_WINNT < 0x600) - #error - #endif - ]]) - ],[ - SUPPORT_FEATURES="$SUPPORT_FEATURES threadsafe" - ],[ - ]) -fi - dnl replace spaces with newlines dnl sort the lines dnl replace the newlines back to spaces @@ -4416,7 +4222,6 @@ AC_CONFIG_FILES([Makefile \ lib/Makefile \ scripts/Makefile \ lib/libcurl.vers \ - lib/libcurl.plist \ tests/Makefile \ tests/certs/Makefile \ tests/certs/scripts/Makefile \ @@ -4473,7 +4278,6 @@ AC_MSG_NOTICE([Configured to build curl/libcurl: RTMP: ${curl_rtmp_msg} PSL: ${curl_psl_msg} Alt-svc: ${curl_altsvc_msg} - Headers API: ${curl_headers_msg} HSTS: ${curl_hsts_msg} HTTP1: ${curl_h1_msg} HTTP2: ${curl_h2_msg} diff --git a/3rdparty/curl-7.84.0/curl-config.in b/3rdparty/curl-7.80.0/curl-config.in similarity index 98% rename from 3rdparty/curl-7.84.0/curl-config.in rename to 3rdparty/curl-7.80.0/curl-config.in index aaf2b8a4..8b4a29a9 100644 --- a/3rdparty/curl-7.84.0/curl-config.in +++ b/3rdparty/curl-7.80.0/curl-config.in @@ -6,7 +6,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 2001 - 2022, Daniel Stenberg, , et al. +# Copyright (C) 2001 - 2020, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -19,8 +19,6 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # -# SPDX-License-Identifier: curl -# ########################################################################### prefix=@prefix@ diff --git a/3rdparty/curl-7.84.0/depcomp b/3rdparty/curl-7.80.0/depcomp similarity index 100% rename from 3rdparty/curl-7.84.0/depcomp rename to 3rdparty/curl-7.80.0/depcomp diff --git a/3rdparty/curl-7.84.0/docs/ALTSVC.md b/3rdparty/curl-7.80.0/docs/ALTSVC.md similarity index 94% rename from 3rdparty/curl-7.84.0/docs/ALTSVC.md rename to 3rdparty/curl-7.80.0/docs/ALTSVC.md index d347f6e1..25437d6f 100644 --- a/3rdparty/curl-7.84.0/docs/ALTSVC.md +++ b/3rdparty/curl-7.80.0/docs/ALTSVC.md @@ -10,7 +10,7 @@ curl features support for the Alt-Svc: HTTP header. ## Standard -[RFC 7838](https://datatracker.ietf.org/doc/html/rfc7838) +[RFC 7838](https://tools.ietf.org/html/rfc7838) # Alt-Svc cache file format diff --git a/3rdparty/curl-7.84.0/docs/BINDINGS.md b/3rdparty/curl-7.80.0/docs/BINDINGS.md similarity index 88% rename from 3rdparty/curl-7.84.0/docs/BINDINGS.md rename to 3rdparty/curl-7.80.0/docs/BINDINGS.md index b9f68ea2..995f830e 100644 --- a/3rdparty/curl-7.84.0/docs/BINDINGS.md +++ b/3rdparty/curl-7.80.0/docs/BINDINGS.md @@ -10,13 +10,11 @@ libcurl bindings The bindings listed below are not part of the curl/libcurl distribution archives, but must be downloaded and installed separately. - - [Ada95](https://web.archive.org/web/20070403105909/www.almroth.com/adacurl/index.html) Written by Andreas Almroth [Basic](https://scriptbasic.com/) ScriptBasic bindings written by Peter Verhas -C++: [curlpp](https://github.com/jpbarrette/curlpp/) Written by Jean-Philippe Barrette-LaPierre, +C++: [curlpp](https://curlpp.org/) Written by Jean-Philippe Barrette-LaPierre, [curlcpp](https://github.com/JosephP91/curlcpp) by Giuseppe Persico and [C++ Requests](https://github.com/libcpr/cpr) by Huu Nguyen @@ -37,7 +35,7 @@ Clojure: [clj-curl](https://github.com/lsevero/clj-curl) by Lucas Severo [Euphoria](https://web.archive.org/web/20050204080544/rays-web.com/eulibcurl.htm) Written by Ray Smith -[Falcon](http://www.falconpl.org/project_docs/curl/) +[Falcon](http://www.falconpl.org/index.ftd?page_id=prjs&prj_id=curl) [Ferite](https://web.archive.org/web/20150102192018/ferite.org/) Written by Paul Querna @@ -47,17 +45,15 @@ Clojure: [clj-curl](https://github.com/lsevero/clj-curl) by Lucas Severo Go: [go-curl](https://github.com/andelf/go-curl) by ShuYu Wang -[Guile](https://github.com/spk121/guile-curl) Written by Michael L. Gran +[Guile](https://www.lonelycactus.com/guile-curl.html) Written by Michael L. Gran [Harbour](https://github.com/vszakats/hb/tree/main/contrib/hbcurl) Written by Viktor Szakats [Haskell](https://hackage.haskell.org/package/curl) Written by Galois, Inc -[Hollywood](https://www.hollywood-mal.com/download.html) hURL by Andreas Falkenhahn - [Java](https://github.com/pjlegato/curl-java) -[Julia](https://github.com/JuliaWeb/LibCURL.jl) Written by Amit Murthy +[Julia](https://github.com/forio/Curl.jl) Written by Paul Howe [Kapito](https://github.com/puzza007/katipo) is an Erlang HTTP library around libcurl. @@ -88,14 +84,10 @@ Bailiff and Bálint Szilakszi, [PostgreSQL](https://github.com/pramsey/pgsql-http) - HTTP client for PostgreSQL -[PostgreSQL](https://github.com/RekGRpth/pg_curl) - cURL client for PostgreSQL - [PureBasic](https://www.purebasic.com/documentation/http/index.html) uses libcurl in its "native" HTTP subsystem [Python](http://pycurl.io/) PycURL by Kjetil Jacobsen -[Q](https://q-lang.sourceforge.io/) The libcurl module is part of the default install - [R](https://cran.r-project.org/package=curl) [Rexx](https://rexxcurl.sourceforge.io/) Written Mark Hessling @@ -104,8 +96,7 @@ Bailiff and Bálint Szilakszi, RPG, support for ILE/RPG on OS/400 is included in source distribution -Ruby: [curb](https://github.com/taf2/curb) written by Ross Bamford, -[ruby-curl-multi](https://github.com/kball/curl_multi.rb) by Kristjan Petursson and Keith Rarick +Ruby: [curb](https://github.com/taf2/curb) written by Ross Bamford [Rust](https://github.com/alexcrichton/curl-rust) curl-rust - by Carl Lerche @@ -119,7 +110,7 @@ Ruby: [curb](https://github.com/taf2/curb) written by Ross Bamford, [SP-Forth](https://sourceforge.net/p/spf/spf/ci/master/tree/devel/~ac/lib/lin/curl/) Written by Andrey Cherezov -[SPL](https://web.archive.org/web/20210203022158/http://www.clifford.at/spl/spldoc/curl.html) Written by Clifford Wolf +[SPL](http://www.clifford.at/spl/) Written by Clifford Wolf [Tcl](https://web.archive.org/web/20160826011806/mirror.yellow5.com/tclcurl/) Tclcurl by Andrés García @@ -127,6 +118,8 @@ Ruby: [curb](https://github.com/taf2/curb) written by Ross Bamford, [Visual Foxpro](https://web.archive.org/web/20130730181523/www.ctl32.com.ar/libcurl.asp) by Carlos Alloatti +[Q](https://q-lang.sourceforge.io/) The libcurl module is part of the default install + [wxWidgets](https://wxcode.sourceforge.io/components/wxcurl/) Written by Casey O'Donnell [XBLite](https://web.archive.org/web/20060426150418/perso.wanadoo.fr/xblite/libraries.html) Written by David Szafranski diff --git a/3rdparty/curl-7.84.0/docs/BUFREF.md b/3rdparty/curl-7.80.0/docs/BUFREF.md similarity index 97% rename from 3rdparty/curl-7.84.0/docs/BUFREF.md rename to 3rdparty/curl-7.80.0/docs/BUFREF.md index 35c53426..2697919a 100644 --- a/3rdparty/curl-7.84.0/docs/BUFREF.md +++ b/3rdparty/curl-7.80.0/docs/BUFREF.md @@ -6,7 +6,7 @@ when the reference is invalidated. Once referenced, a buffer cannot be reallocated. A data length is stored within the reference for binary data handling -purposes; it is not used by the bufref API. +purpose; it is not used by the bufref API. The `struct bufref` is used to hold data referencing a buffer. The members of that structure **MUST NOT** be accessed or modified without using the dedicated @@ -43,7 +43,7 @@ void Curl_bufref_set(struct bufref *br, const void *buffer, size_t length, ``` Releases the previously referenced buffer, then assigns the new `buffer` to -the structure, associated with its `destructor` function. The latter can be +the structure, associated with its `destructor` function. The later can be specified as `NULL`: this will be the case when the referenced buffer is static. diff --git a/3rdparty/curl-7.80.0/docs/BUG-BOUNTY.md b/3rdparty/curl-7.80.0/docs/BUG-BOUNTY.md new file mode 100644 index 00000000..25159fb3 --- /dev/null +++ b/3rdparty/curl-7.80.0/docs/BUG-BOUNTY.md @@ -0,0 +1,83 @@ +# The curl bug bounty + +The curl project runs a bug bounty program in association with +[HackerOne](https://www.hackerone.com) and the [Internet Bug +Bounty](https://internetbugbounty.org). + +# How does it work? + +Start out by posting your suspected security vulnerability directly to [curl's +HackerOne program](https://hackerone.com/curl). + +After you have reported a security issue, it has been deemed credible, and a +patch and advisory has been made public, you may be eligible for a bounty from +this program. + +See all details at [https://hackerone.com/curl](https://hackerone.com/curl) + +This bounty is relying on funds from sponsors. If you use curl professionally, +consider help funding this! See +[https://opencollective.com/curl](https://opencollective.com/curl) for +details. + +# What are the reward amounts? + +The curl project offers monetary compensation for reported and published +security vulnerabilities. The amount of money that is rewarded depends on how +serious the flaw is determined to be. + +We offer reward money *up to* a certain amount per severity. The curl security +team determines the severity of each reported flaw on a case by case basis and +the exact amount rewarded to the reporter is then decided. + +Check out the current award amounts at [https://hackerone.com/curl](https://hackerone.com/curl) + +# Who is eligible for a reward? + +Everyone and anyone who reports a security problem in a released curl version +that has not already been reported can ask for a bounty. + +Vulnerabilities in features that are off by default and documented as +experimental are not eligible for a reward. + +The vulnerability has to be fixed and publicly announced (by the curl project) +before a bug bounty will be considered. + +Bounties need to be requested within twelve months from the publication of the +vulnerability. + +# Product vulnerabilities only + +This bug bounty only concerns the curl and libcurl products and thus their +respective source codes - when running on existing hardware. It does not +include documentation, websites, or other infrastructure. + +The curl security team is the sole arbiter if a reported flaw is subject to a +bounty or not. + +# How are vulnerabilities graded? + +The grading of each reported vulnerability that makes a reward claim will be +performed by the curl security team. The grading will be based on the CVSS +(Common Vulnerability Scoring System) 3.0. + +# How are reward amounts determined? + +The curl security team first gives the vulnerability a score, as mentioned +above, and based on that level we set an amount depending on the specifics of +the individual case. Other sponsors of the program might also get involved and +can raise the amounts depending on the particular issue. + +# What happens if the bounty fund is drained? + +The bounty fund depends on sponsors. If we pay out more bounties than we add, +the fund will eventually drain. If that end up happening, we will simply not +be able to pay out as high bounties as we would like and hope that we can +convince new sponsors to help us top up the fund again. + +# Regarding taxes, etc. on the bounties + +In the event that the individual receiving a curl bug bounty needs to pay +taxes on the reward money, the responsibility lies with the receiver. The +curl project or its security team never actually receive any of this money, +hold the money, or pay out the money. diff --git a/3rdparty/curl-7.84.0/docs/BUGS.md b/3rdparty/curl-7.80.0/docs/BUGS.md similarity index 93% rename from 3rdparty/curl-7.84.0/docs/BUGS.md rename to 3rdparty/curl-7.80.0/docs/BUGS.md index 584c67f0..1b09efbf 100644 --- a/3rdparty/curl-7.84.0/docs/BUGS.md +++ b/3rdparty/curl-7.80.0/docs/BUGS.md @@ -17,7 +17,7 @@ a go at a solution. You can optionally also submit your problem in [curl's bug tracking system](https://github.com/curl/curl/issues). - Please read the rest of this document below first before doing that. + Please read the rest of this document below first before doing that! If you feel you need to ask around first, find a suitable [mailing list]( https://curl.se/mail/) and post your questions there. @@ -65,10 +65,10 @@ debug dump with your bug report. The output you get by using the `-v` or `--trace` options. - If curl crashed, causing a core dump (in Unix), there is hardly any use to - send that huge file to anyone of us. Unless we have the same system setup as - you, we cannot do much with it. Instead, we ask you to get a stack trace and - send that (much smaller) output to us instead. + If curl crashed, causing a core dump (in unix), there is hardly any use to + send that huge file to anyone of us. Unless we have an exact same system + setup as you, we cannot do much with it. Instead, we ask you to get a stack + trace and send that (much smaller) output to us instead! The address and how to subscribe to the mailing lists are detailed in the `MANUAL.md` file. @@ -102,9 +102,9 @@ it out of an ambition to keep curl and libcurl excellent products and out of pride. - Please do not assume that you can just lump over something to us and it will - then magically be fixed after some given time. Most often we need feedback - and help to understand what you have experienced and how to repeat a + But please do not assume that you can just lump over something to us and it + will then magically be fixed after some given time. Most often we need + feedback and help to understand what you have experienced and how to repeat a problem. Then we may only be able to assist YOU to debug the problem and to track down the proper fix. @@ -128,7 +128,7 @@ The list that is presented is the stack trace. If everything worked, it is supposed to contain the chain of functions that were called when curl - crashed. Include the stack trace with your detailed bug report, it will help a + crashed. Include the stack trace with your detailed bug report. it will help a lot. ## Bugs in libcurl bindings @@ -177,7 +177,7 @@ ## What happens on first filing When a new issue is posted in the issue tracker or on the mailing list, the - team of developers first needs to see the report. Maybe they took the day off, + team of developers first need to see the report. Maybe they took the day off, maybe they are off in the woods hunting. Have patience. Allow at least a few days before expecting someone to have responded. @@ -209,7 +209,7 @@ If the problem have not been understood or reproduced, and there's nobody responding to follow-up questions or questions asking for clarifications or for discussing possible ways to move forward with the task, we take that as a - strong suggestion that the bug is unimportant. + strong suggestion that the bug is not important. Unimportant issues will be closed as inactive sooner or later as they cannot be fixed. The inactivity period (waiting for responses) should not be shorter @@ -257,7 +257,7 @@ ## Closing off stalled bugs The [issue and pull request trackers](https://github.com/curl/curl) only - hold "active" entries open (using a non-precise definition of what active + holds "active" entries open (using a non-precise definition of what active actually is, but they are at least not completely dead). Those that are abandoned or in other ways dormant will be closed and sometimes added to `TODO` and `KNOWN_BUGS` instead. diff --git a/3rdparty/curl-7.84.0/docs/CHECKSRC.md b/3rdparty/curl-7.80.0/docs/CHECKSRC.md similarity index 92% rename from 3rdparty/curl-7.84.0/docs/CHECKSRC.md rename to 3rdparty/curl-7.80.0/docs/CHECKSRC.md index 58a33d7b..97300112 100644 --- a/3rdparty/curl-7.84.0/docs/CHECKSRC.md +++ b/3rdparty/curl-7.80.0/docs/CHECKSRC.md @@ -9,7 +9,7 @@ check that it adheres to our [Source Code Style guide](CODE_STYLE.md). ## Command line options -`-W[file]` skip that file and exclude it from being checked. Helpful +`-W[file]` skip that file and excludes it from being checked. Helpful when, for example, one of the files is generated. `-D[dir]` directory name to prepend to file names when accessing them. @@ -18,11 +18,11 @@ when, for example, one of the files is generated. ## What does checksrc warn for? -checksrc does not check and verify the code against the entire style guide. -The script is an effort to detect the most common mistakes and syntax mistakes -that contributors make before they get accustomed to our code style. Heck, -many of us regulars do the mistakes too and this script helps us keep the code -in shape. +checksrc does not check and verify the code against the entire style guide, +but the script is instead an effort to detect the most common mistakes and +syntax mistakes that contributors make before they get accustomed to our code +style. Heck, many of us regulars do the mistakes too and this script helps us +keep the code in shape. checksrc.pl -h @@ -41,7 +41,7 @@ warnings are: more appropriate `char *name` style. The asterisk should sit right next to the name without a space in between. -- `BADCOMMAND`: There's a bad `!checksrc!` instruction in the code. See the +- `BADCOMMAND`: There's a bad !checksrc! instruction in the code. See the **Ignore certain warnings** section below for details. - `BANNEDFUNC`: A banned function was used. The functions sprintf, vsprintf, @@ -130,13 +130,11 @@ the directory where they should be activated with commands to enable the warnings you are interested in. The format of the file is to enable one warning per line like so: `enable ` -Currently these are the extended warnings which can be enabled: +Currently there is one extended warning which can be enabled: - `COPYRIGHTYEAR`: the current changeset has not updated the copyright year in the source file -- `STRERROR`: use of banned function strerror() - ## Ignore certain warnings Due to the nature of the source code and the flaws of the checksrc tool, there diff --git a/3rdparty/curl-7.84.0/docs/CIPHERS.md b/3rdparty/curl-7.80.0/docs/CIPHERS.md similarity index 86% rename from 3rdparty/curl-7.84.0/docs/CIPHERS.md rename to 3rdparty/curl-7.80.0/docs/CIPHERS.md index e1df7642..af8f2f4c 100644 --- a/3rdparty/curl-7.84.0/docs/CIPHERS.md +++ b/3rdparty/curl-7.80.0/docs/CIPHERS.md @@ -18,7 +18,7 @@ libcurl was built to use. This is an attempt to list known cipher names. ## OpenSSL -(based on [OpenSSL docs](https://www.openssl.org/docs/manmaster/man1/openssl-ciphers.html)) +(based on [OpenSSL docs](https://www.openssl.org/docs/man1.1.0/apps/ciphers.html)) When specifying multiple cipher names, separate them with colon (`:`). @@ -278,9 +278,9 @@ When specifying multiple cipher names, separate them with colon (`:`). ## GSKit -Ciphers are internally defined as [numeric -codes](https://www.ibm.com/support/knowledgecenter/ssw_ibm_i_73/apis/gsk_attribute_set_buffer.htm). libcurl -maps them to the following case-insensitive names. +Ciphers are internally defined as +[numeric codes](https://www.ibm.com/support/knowledgecenter/ssw_ibm_i_73/apis/gsk_attribute_set_buffer.htm), +but libcurl maps them to the following case-insensitive names. ### SSL2 cipher suites (insecure: disabled by default) @@ -518,63 +518,5 @@ and the request will fail. As of curl 7.77.0, you can also pass `SCH_USE_STRONG_CRYPTO` as a cipher name to [constrain the set of available ciphers as specified in the schannel documentation](https://docs.microsoft.com/en-us/windows/win32/secauthn/tls-cipher-suites-in-windows-server-2022). -Note that the supported ciphers in this case follow the OS version, so if you +Note that the supported ciphers in this case follows the OS version, so if you are running an outdated OS you might still be supporting weak ciphers. - -## BearSSL - -BearSSL ciphers can be specified by either the OpenSSL name (`ECDHE-RSA-AES128-GCM-SHA256`) or the IANA name (`TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256`). - -Since BearSSL 0.1: - -`DES-CBC3-SHA` -`AES128-SHA` -`AES256-SHA` -`AES128-SHA256` -`AES256-SHA256` -`AES128-GCM-SHA256` -`AES256-GCM-SHA384` -`ECDH-ECDSA-DES-CBC3-SHA` -`ECDH-ECDSA-AES128-SHA` -`ECDH-ECDSA-AES256-SHA` -`ECDHE-ECDSA-DES-CBC3-SHA` -`ECDHE-ECDSA-AES128-SHA` -`ECDHE-ECDSA-AES256-SHA` -`ECDH-RSA-DES-CBC3-SHA` -`ECDH-RSA-AES128-SHA` -`ECDH-RSA-AES256-SHA` -`ECDHE-RSA-DES-CBC3-SHA` -`ECDHE-RSA-AES128-SHA` -`ECDHE-RSA-AES256-SHA` -`ECDHE-ECDSA-AES128-SHA256` -`ECDHE-ECDSA-AES256-SHA384` -`ECDH-ECDSA-AES128-SHA256` -`ECDH-ECDSA-AES256-SHA384` -`ECDHE-RSA-AES128-SHA256` -`ECDHE-RSA-AES256-SHA384` -`ECDH-RSA-AES128-SHA256` -`ECDH-RSA-AES256-SHA384` -`ECDHE-ECDSA-AES128-GCM-SHA256` -`ECDHE-ECDSA-AES256-GCM-SHA384` -`ECDH-ECDSA-AES128-GCM-SHA256` -`ECDH-ECDSA-AES256-GCM-SHA384` -`ECDHE-RSA-AES128-GCM-SHA256` -`ECDHE-RSA-AES256-GCM-SHA384` -`ECDH-RSA-AES128-GCM-SHA256` -`ECDH-RSA-AES256-GCM-SHA384` - -Since BearSSL 0.2: - -`ECDHE-RSA-CHACHA20-POLY1305` -`ECDHE-ECDSA-CHACHA20-POLY1305` - -Since BearSSL 0.6: - -`AES128-CCM` -`AES256-CCM` -`AES128-CCM8` -`AES256-CCM8` -`ECDHE-ECDSA-AES128-CCM` -`ECDHE-ECDSA-AES256-CCM` -`ECDHE-ECDSA-AES128-CCM8` -`ECDHE-ECDSA-AES256-CCM8` diff --git a/3rdparty/curl-7.84.0/docs/CMakeLists.txt b/3rdparty/curl-7.80.0/docs/CMakeLists.txt similarity index 91% rename from 3rdparty/curl-7.84.0/docs/CMakeLists.txt rename to 3rdparty/curl-7.80.0/docs/CMakeLists.txt index 97101a48..b3230ec5 100644 --- a/3rdparty/curl-7.84.0/docs/CMakeLists.txt +++ b/3rdparty/curl-7.80.0/docs/CMakeLists.txt @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,8 +18,6 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # -# SPDX-License-Identifier: curl -# ########################################################################### #add_subdirectory(examples) add_subdirectory(libcurl) diff --git a/3rdparty/curl-7.84.0/docs/CODE_OF_CONDUCT.md b/3rdparty/curl-7.80.0/docs/CODE_OF_CONDUCT.md similarity index 100% rename from 3rdparty/curl-7.84.0/docs/CODE_OF_CONDUCT.md rename to 3rdparty/curl-7.80.0/docs/CODE_OF_CONDUCT.md diff --git a/3rdparty/curl-7.84.0/docs/CODE_REVIEW.md b/3rdparty/curl-7.80.0/docs/CODE_REVIEW.md similarity index 100% rename from 3rdparty/curl-7.84.0/docs/CODE_REVIEW.md rename to 3rdparty/curl-7.80.0/docs/CODE_REVIEW.md diff --git a/3rdparty/curl-7.84.0/docs/CODE_STYLE.md b/3rdparty/curl-7.80.0/docs/CODE_STYLE.md similarity index 96% rename from 3rdparty/curl-7.84.0/docs/CODE_STYLE.md rename to 3rdparty/curl-7.80.0/docs/CODE_STYLE.md index 5481aa50..e716f685 100644 --- a/3rdparty/curl-7.84.0/docs/CODE_STYLE.md +++ b/3rdparty/curl-7.80.0/docs/CODE_STYLE.md @@ -9,9 +9,8 @@ style is more important than individual contributors having their own personal tastes satisfied. Our C code has a few style rules. Most of them are verified and upheld by the -`scripts/checksrc.pl` script. Invoked with `make checksrc` or even by default -by the build system when built after `./configure --enable-debug` has been -used. +`lib/checksrc.pl` script. Invoked with `make checksrc` or even by default by +the build system when built after `./configure --enable-debug` has been used. It is normally not a problem for anyone to follow the guidelines, as you just need to copy the style already used in the source code and there are no @@ -174,7 +173,7 @@ else if(b) return FALSE; ## Space around operators -Please use spaces on both sides of operators in C expressions. Postfix **(), +Please use spaces on both sides of operators in C expressions. Postfix **(), [], ->, ., ++, --** and Unary **+, -, !, ~, &** operators excluded they should have no space. diff --git a/3rdparty/curl-7.84.0/docs/CONTRIBUTE.md b/3rdparty/curl-7.80.0/docs/CONTRIBUTE.md similarity index 77% rename from 3rdparty/curl-7.84.0/docs/CONTRIBUTE.md rename to 3rdparty/curl-7.80.0/docs/CONTRIBUTE.md index 506af9b4..b8254088 100644 --- a/3rdparty/curl-7.84.0/docs/CONTRIBUTE.md +++ b/3rdparty/curl-7.80.0/docs/CONTRIBUTE.md @@ -4,11 +4,13 @@ This document is intended to offer guidelines on how to best contribute to the curl project. This concerns new features as well as corrections to existing flaws or bugs. -## Join the Community +## Learning curl + +### Join the Community Skip over to [https://curl.se/mail/](https://curl.se/mail/) and join -the appropriate mailing list(s). Read up on details before you post -questions. Read this file before you start sending patches. We prefer +the appropriate mailing list(s). Read up on details before you post +questions. Read this file before you start sending patches! We prefer questions sent to and discussions being held on the mailing list(s), not sent to individuals. @@ -21,7 +23,7 @@ If you are at all interested in the code side of things, consider clicking 'watch' on the [curl repo on GitHub](https://github.com/curl/curl) to be notified of pull requests and new issues posted there. -## License and copyright +### License and copyright When contributing with code, you agree to put your changes and new code under the same license curl and libcurl is already using unless stated and agreed @@ -42,9 +44,9 @@ By submitting a patch to the curl project, you are assumed to have the right to the code and to be allowed by your employer or whatever to hand over that patch/code to us. We will credit you for your changes as far as possible, to give credit but also to keep a trace back to who made what changes. Please -always provide us with your full real name when contributing, +always provide us with your full real name when contributing! -## What To Read +### What To Read Source code, the man pages, the [INTERNALS document](https://curl.se/dev/internals.html), @@ -96,12 +98,12 @@ and regression in the future. Please try to get the latest available sources to make your patches against. It makes the lives of the developers so much easier. The best is if you get the most up-to-date sources from the git repository, but the latest release -archive is quite OK as well. +archive is quite OK as well! ### Documentation Writing docs is dead boring and one of the big problems with many open source -projects. But someone's gotta do it. It makes things a lot easier if you +projects. But someone's gotta do it! It makes things a lot easier if you submit a small description of your fix or your new features with every contribution so that it can be swiftly added to the package documentation. @@ -122,7 +124,7 @@ If you do not have test cases or perhaps you have done something that is hard to write tests for, do explain exactly how you have otherwise tested and verified your changes. -## Submit Your Changes +## Sharing Your Changes ### How to get your changes into the main sources @@ -131,17 +133,12 @@ GitHub](https://github.com/curl/curl/pulls), but you can also send your plain patch to [the curl-library mailing list](https://curl.se/mail/list.cgi?list=curl-library). -If you opt to post a patch on the mailing list, chances are someone will -convert it into a pull request for you, to have the CI jobs verify it proper -before it can be merged. Be prepared that some feedback on the proposed change -might then come on GitHub. - -Your change will be reviewed and discussed and you will be expected to correct -flaws pointed out and update accordingly, or the change risks stalling and -eventually just getting deleted without action. As a submitter of a change, -you are the owner of that change until it has been merged. +Either way, your change will be reviewed and discussed there and you will be +expected to correct flaws pointed out and update accordingly, or the change +risks stalling and eventually just getting deleted without action. As a +submitter of a change, you are the owner of that change until it has been merged. -Respond on the list or on GitHub about the change and answer questions and/or +Respond on the list or on github about the change and answer questions and/or fix nits/flaws. This is important. We will take lack of replies as a sign that you are not anxious to get your patch accepted and we tend to simply drop such changes. @@ -157,9 +154,41 @@ git commit that is easy to merge and they are easy to track and not that easy to lose in the flood of many emails, like they sometimes do on the mailing lists. -Every pull request submitted will automatically be -tested in several different ways. [See CI.md for more -information](https://github.com/curl/curl/blob/master/tests/CI.md). +Every pull request submitted will automatically be tested in several different +ways. Every pull request is verified for each of the following: + + - ... it still builds, warning-free, on Linux and macOS, with both + clang and gcc + - ... it still builds fine on Windows with several MSVC versions + - ... it still builds with cmake on Linux, with gcc and clang + - ... it follows rudimentary code style rules + - ... the test suite still runs 100% fine + - ... the release tarball (the "dist") still works + - ... it builds fine in-tree as well as out-of-tree + - ... code coverage does not shrink drastically + +If the pull-request fails one of these tests, it will show up as a red X and +you are expected to fix the problem. If you do not understand when the issue is +or have other problems to fix the complaint, just ask and other project +members will likely be able to help out. + +Consider the following table while looking at pull request failures: + + | CI platform as shown in PR | State | What to look at next | + | ----------------------------------- | ------ | -------------------------- | + | CI / codeql | stable | quality check results | + | CI / fuzzing | stable | fuzzing results | + | CI / macos ... | stable | all errors and failures | + | Code scanning results / CodeQL | stable | quality check results | + | FreeBSD FreeBSD: ... | stable | all errors and failures | + | LGTM analysis: Python | stable | new findings | + | LGTM analysis: C/C++ | stable | new findings | + | buildbot/curl_winssl_ ... | stable | all errors and failures | + | continuous-integration/appveyor/pr | stable | all errors and failures | + | curl.curl (linux ...) | stable | all errors and failures | + | curl.curl (windows ...) | flaky | repetitive errors/failures | + | deepcode-ci-bot | stable | new findings | + | musedev | stable | new findings | Sometimes the tests fail due to a dependency service temporarily being offline or otherwise unavailable, eg. package downloads. In this case you can just @@ -172,21 +201,15 @@ actual content changed also allows you to retrigger the tests for that commit. When you adjust your pull requests after review, consider squashing the commits so that we can review the full updated version more easily. -A pull request sent to the project might get labeled `needs-votes` by a -project maintainer. This label means that in addition to meeting all other -checks and qualifications this pull request must also receive more "votes" of -user support. More signs that people want this to happen. It could be in the -form of messages saying so, or thumbs-up reactions on GitHub. - -### Making quality changes +### Making quality patches Make the patch against as recent source versions as possible. -If you have followed the tips in this document and your patch still has not -been incorporated or responded to after some weeks, consider resubmitting it -to the list or better yet: change it to a pull request. +If you have followed the tips in this document and your patch still has not been +incorporated or responded to after some weeks, consider resubmitting it to the +list or better yet: change it to a pull request. -### Commit messages +### Write good commit messages A short guide to how to write commit messages in the curl project. @@ -281,21 +304,3 @@ For Windows: ### Useful resources - [Webinar on getting code into cURL](https://www.youtube.com/watch?v=QmZ3W1d6LQI) - -## Update copyright and license information - -There is a CI job called **REUSE compliance / check** that will run on every -pull request and commit to verify that the *REUSE state* of all files are -still fine. - -This means that all files need to have their license and copyright information -clearly stated. Ideally by having the standard curl source code header, with -an accurate copyright year range and the SPDX-License-Identifier included. If -the header does not work, you can use a smaller header or as a last resort add -the information for a specific file to the `.reuse/dep5` file. - -We update copyright year ranges to end on the year of the most recent change -of the individual file. - -You can manually verify the copyright and compliance status by running the -`./scripts/copyright.pl` script in the root of the git repository. diff --git a/3rdparty/curl-7.84.0/docs/CURL-DISABLE.md b/3rdparty/curl-7.80.0/docs/CURL-DISABLE.md similarity index 97% rename from 3rdparty/curl-7.84.0/docs/CURL-DISABLE.md rename to 3rdparty/curl-7.80.0/docs/CURL-DISABLE.md index 7ece3dc5..a2e75f19 100644 --- a/3rdparty/curl-7.84.0/docs/CURL-DISABLE.md +++ b/3rdparty/curl-7.80.0/docs/CURL-DISABLE.md @@ -37,10 +37,6 @@ about existing options to `curl_easy_setopt`. Disable the GOPHER protocol. -## CURL_DISABLE_HEADERS_API - -Disable the HTTP header API. - ## CURL_DISABLE_HSTS Disable the HTTP Strict Transport Security support. diff --git a/3rdparty/curl-7.80.0/docs/DEPRECATE.md b/3rdparty/curl-7.80.0/docs/DEPRECATE.md new file mode 100644 index 00000000..d0d94d1a --- /dev/null +++ b/3rdparty/curl-7.80.0/docs/DEPRECATE.md @@ -0,0 +1,13 @@ +# Items to be removed from future curl releases + +If any of these deprecated features is a cause for concern for you, please +email the +[curl-library mailing list](https://lists.haxx.se/listinfo/curl-library) +as soon as possible and explain to us why this is a problem for you and +how your use case cannot be satisfied properly using a workaround. + +## Past removals + + - Pipelining + - axTLS + - PolarSSL diff --git a/3rdparty/curl-7.84.0/docs/DYNBUF.md b/3rdparty/curl-7.80.0/docs/DYNBUF.md similarity index 88% rename from 3rdparty/curl-7.84.0/docs/DYNBUF.md rename to 3rdparty/curl-7.80.0/docs/DYNBUF.md index a984a41e..6dd2430c 100644 --- a/3rdparty/curl-7.84.0/docs/DYNBUF.md +++ b/3rdparty/curl-7.80.0/docs/DYNBUF.md @@ -1,7 +1,7 @@ # dynbuf This is the internal module for creating and handling "dynamic buffers". This -means buffers that can be appended to, dynamically and grow to adapt. +means buffers that can be appended to, dynamically and grow in size to adapt. There will always be a terminating zero put at the end of the dynamic buffer. @@ -84,9 +84,9 @@ larger than the buffer length. char *Curl_dyn_ptr(const struct dynbuf *s); ``` -Returns a `char *` to the buffer if it has a length, otherwise may return -NULL. Since the buffer may be reallocated, this pointer should not be trusted -or used anymore after the next buffer manipulation call. +Returns a `char *` to the buffer if it has a length, otherwise a NULL. Since +the buffer may be reallocated, this pointer should not be trusted or used +anymore after the next buffer manipulation call. ## uptr @@ -94,9 +94,9 @@ or used anymore after the next buffer manipulation call. unsigned char *Curl_dyn_uptr(const struct dynbuf *s); ``` -Returns an `unsigned char *` to the buffer if it has a length, otherwise may -return NULL. Since the buffer may be reallocated, this pointer should not be -trusted or used anymore after the next buffer manipulation call. +Returns an `unsigned char *` to the buffer if it has a length, otherwise a +NULL. Since the buffer may be reallocated, this pointer should not be trusted +or used anymore after the next buffer manipulation call. ## len diff --git a/3rdparty/curl-7.84.0/docs/ECH.md b/3rdparty/curl-7.80.0/docs/ECH.md similarity index 100% rename from 3rdparty/curl-7.84.0/docs/ECH.md rename to 3rdparty/curl-7.80.0/docs/ECH.md diff --git a/3rdparty/curl-7.84.0/docs/EXPERIMENTAL.md b/3rdparty/curl-7.80.0/docs/EXPERIMENTAL.md similarity index 88% rename from 3rdparty/curl-7.84.0/docs/EXPERIMENTAL.md rename to 3rdparty/curl-7.80.0/docs/EXPERIMENTAL.md index 42b6e214..ce9a1b8e 100644 --- a/3rdparty/curl-7.84.0/docs/EXPERIMENTAL.md +++ b/3rdparty/curl-7.80.0/docs/EXPERIMENTAL.md @@ -20,5 +20,4 @@ Experimental support in curl means: - The Hyper HTTP backend - HTTP/3 support and options - - `CURLSSLOPT_NATIVE_CA` (No configure option, feature built in when supported) - - The rustls backend + - CURLSSLOPT_NATIVE_CA (No configure option, feature built in when supported) diff --git a/3rdparty/curl-7.84.0/docs/FAQ b/3rdparty/curl-7.80.0/docs/FAQ similarity index 89% rename from 3rdparty/curl-7.84.0/docs/FAQ rename to 3rdparty/curl-7.80.0/docs/FAQ index 375715dc..c70225e1 100644 --- a/3rdparty/curl-7.84.0/docs/FAQ +++ b/3rdparty/curl-7.80.0/docs/FAQ @@ -14,11 +14,11 @@ FAQ 1.5 Who makes curl? 1.6 What do you get for making curl? 1.7 What about CURL from curl.com? - 1.8 I have a problem, who do I mail? + 1.8 I have a problem who do I mail? 1.9 Where do I buy commercial support for curl? 1.10 How many are using curl? 1.11 Why do you not update ca-bundle.crt - 1.12 I have a problem, who can I chat with? + 1.12 I have a problem who can I chat with? 1.13 curl's ECCN number? 1.14 How do I submit my patch? 1.15 How do I port libcurl to my OS? @@ -42,10 +42,10 @@ FAQ 3.11 How do I POST with a different Content-Type? 3.12 Why do FTP-specific features over HTTP proxy fail? 3.13 Why do my single/double quotes fail? - 3.14 Does curl support JavaScript or PAC (automated proxy config)? + 3.14 Does curl support Javascript or PAC (automated proxy config)? 3.15 Can I do recursive fetches with curl? 3.16 What certificates do I need when I use SSL? - 3.17 How do I list the root directory of an FTP server? + 3.17 How do I list the root dir of an FTP server? 3.18 Can I use curl to send a POST/PUT and not wait for a response? 3.19 How do I get HTTP from a host using a specific IP address? 3.20 How to SFTP from my user's home directory? @@ -56,7 +56,7 @@ FAQ 4.2 Why do I get problems when I use & or % in the URL? 4.3 How can I use {, }, [ or ] to specify multiple URLs? 4.4 Why do I get downloaded data even though the web page does not exist? - 4.5 Why do I get return code XXX from an HTTP server? + 4.5 Why do I get return code XXX from a HTTP server? 4.5.1 "400 Bad Request" 4.5.2 "401 Unauthorized" 4.5.3 "403 Forbidden" @@ -65,19 +65,19 @@ FAQ 4.5.6 "301 Moved Permanently" 4.6 Can you tell me what error code 142 means? 4.7 How do I keep user names and passwords secret in curl command lines? - 4.8 I found a bug - 4.9 curl cannot authenticate to a server that requires NTLM? - 4.10 My HTTP request using HEAD, PUT or DELETE does not work + 4.8 I found a bug! + 4.9 curl cannot authenticate to the server that requires NTLM? + 4.10 My HTTP request using HEAD, PUT or DELETE does not work! 4.11 Why do my HTTP range requests return the full document? 4.12 Why do I get "certificate verify failed" ? 4.13 Why is curl -R on Windows one hour off? - 4.14 Redirects work in browser but not with curl + 4.14 Redirects work in browser but not with curl! 4.15 FTPS does not work - 4.16 My HTTP POST or PUT requests are slow + 4.16 My HTTP POST or PUT requests are slow! 4.17 Non-functional connect timeouts on Windows 4.18 file:// URLs containing drive letters (Windows, NetWare) 4.19 Why does not curl return an error when the network cable is unplugged? - 4.20 curl does not return error for HTTP non-200 responses + 4.20 curl does not return error for HTTP non-200 responses! 5. libcurl Issues 5.1 Is libcurl thread-safe? @@ -86,7 +86,7 @@ FAQ 5.4 Does libcurl do Winsock initialization on win32 systems? 5.5 Does CURLOPT_WRITEDATA and CURLOPT_READDATA work on win32 ? 5.6 What about Keep-Alive or persistent connections? - 5.7 Link errors when building libcurl on Windows + 5.7 Link errors when building libcurl on Windows! 5.8 libcurl.so.X: open failed: No such file or directory 5.9 How does libcurl resolve host names? 5.10 How do I prevent libcurl from writing the response to stdout? @@ -95,7 +95,7 @@ FAQ 5.13 How do I stop an ongoing transfer? 5.14 Using C++ non-static functions for callbacks? 5.15 How do I get an FTP directory listing? - 5.16 I want a different time-out + 5.16 I want a different time-out! 5.17 Can I write a server with libcurl? 5.18 Does libcurl use threads? @@ -126,7 +126,7 @@ FAQ cURL is the name of the project. The name is a play on 'Client for URLs', originally with URL spelled in uppercase to make it obvious it deals with - URLs. The fact it can also be read as 'see URL' also helped, it works as + URLs. The fact it can also be pronounced 'see URL' also helped, it works as an abbreviation for "Client URL Request Library" or why not the recursive version: "curl URL Request Library". @@ -134,19 +134,20 @@ FAQ libcurl - A client-side URL transfer library, supporting DICT, FILE, FTP, FTPS, - GOPHER, GOPHERS, HTTP, HTTPS, IMAP, IMAPS, LDAP, LDAPS, MQTT, POP3, POP3S, - RTMP, RTMPS, RTSP, SCP, SFTP, SMB, SMBS, SMTP, SMTPS, TELNET and TFTP. + A free and easy-to-use client-side URL transfer library, supporting DICT, + FILE, FTP, FTPS, GOPHER, GOPHERS, HTTP, HTTPS, IMAP, IMAPS, LDAP, LDAPS, + MQTT, POP3, POP3S, RTMP, RTMPS, RTSP, SCP, SFTP, SMB, SMBS, SMTP, SMTPS, + TELNET and TFTP. libcurl supports HTTPS certificates, HTTP POST, HTTP PUT, FTP uploading, Kerberos, SPNEGO, HTTP form based upload, proxies, cookies, user+password - authentication, file transfer resume, http proxy tunneling and more. + authentication, file transfer resume, http proxy tunneling and more! libcurl is highly portable, it builds and works identically on numerous platforms, including Solaris, NetBSD, FreeBSD, OpenBSD, Darwin, HP-UX, - IRIX, AIX, Tru64, Linux, UnixWare, HURD, Windows, Amiga, OS/2, macOS, - Ultrix, QNX, OpenVMS, RISC OS, Novell NetWare, DOS, Symbian, OSF, Android, - Minix, IBM TPF and more... + IRIX, AIX, Tru64, Linux, UnixWare, HURD, Windows, Amiga, OS/2, BeOS, Mac + OS X, Ultrix, QNX, OpenVMS, RISC OS, Novell NetWare, DOS, Symbian, OSF, + Android, Minix, IBM TPF and more... libcurl is free, thread-safe, IPv6 compatible, feature rich, well supported and fast. @@ -174,7 +175,7 @@ FAQ libcurl is a reliable and portable library for doing Internet data transfers using one or more of its supported Internet protocols. - You can use libcurl freely in your application, be it open source, + You can use libcurl for free in your application, be it open source, commercial or closed-source. libcurl is most probably the most portable, most powerful and most often @@ -183,7 +184,7 @@ FAQ 1.3 What is curl not? - curl is not a wget clone. That is a common misconception. Never, during + curl is not a wget clone. That is a common misconception. Never, during curl's development, have we intended curl to replace wget or compete on its market. curl is targeted at single-shot file transfers. @@ -200,8 +201,8 @@ FAQ curl is not a program for a single operating system. curl exists, compiles, builds and runs under a wide range of operating systems, including all - modern Unixes (and a bunch of older ones too), Windows, Amiga, OS/2, macOS, - QNX etc. + modern Unixes (and a bunch of older ones too), Windows, Amiga, BeOS, OS/2, + OS X, QNX etc. 1.4 When will you make curl do XXXX ? @@ -225,7 +226,7 @@ FAQ implement it for you, that is not a friendly attitude. We spend a considerable time already on maintaining and developing curl. In order to get more out of us, you should consider trading in some of your time and - effort in return. Simply go to the GitHub repository which resides at + effort in return. Simply go to the GitHub repo which resides at https://github.com/curl/curl, fork the project, and create pull requests with your proposed changes. @@ -246,8 +247,9 @@ FAQ 1.6 What do you get for making curl? Project cURL is entirely free and open. We do this voluntarily, mostly in - our spare time. Companies may pay individual developers to work on curl. - This is not controlled by nor supervised in any way by the curl project. + our spare time. Companies may pay individual developers to work on curl, + but that is up to each company and developer. This is not controlled by nor + supervised in any way by the curl project. We get help from companies. Haxx provides website, bandwidth, mailing lists etc, GitHub hosts the primary git repository and other services like the bug @@ -275,7 +277,7 @@ FAQ We recognize that we will be living in parallel with curl.com and wish them every success. - 1.8 I have a problem, who do I mail? + 1.8 I have a problem whom do I mail? Please do not mail any single individual unless you really need to. Keep curl-related questions on a suitable mailing list. All available mailing @@ -294,7 +296,7 @@ FAQ issue private while we investigate, confirm it, work and validate a fix and agree on a time schedule for publication etc. That way we produce a fix in a timely manner before the flaw is announced to the world, reducing the impact - the problem risks having on existing users. + the problem risk having on existing users. Security issues can also be taking to the curl security team by emailing security at curl.se (closed list of receivers, mails are not disclosed). @@ -327,7 +329,7 @@ FAQ In the cURL project we have decided not to attempt to keep this file updated (or even present) since deciding what to add to a ca cert bundle is an undertaking we have not been ready to accept, and the one we can get from - Mozilla is perfectly fine so there is no need to duplicate that work. + Mozilla is perfectly fine so there's no need to duplicate that work. Today, with many services performed over HTTPS, every operating system should come with a default ca cert bundle that can be deemed somewhat @@ -339,9 +341,9 @@ FAQ Firefox (by running 'make ca-bundle), or by using our online service setup for this purpose: https://curl.se/docs/caextract.html - 1.12 I have a problem who, can I chat with? + 1.12 I have a problem who can I chat with? - There is a bunch of friendly people hanging out in the #curl channel on the + There's a bunch of friendly people hanging out in the #curl channel on the IRC network libera.chat. If you are polite and nice, chances are good that you can get -- or provide -- help instantly. @@ -421,7 +423,7 @@ FAQ backends. curl can be built to use one of the following SSL alternatives: OpenSSL, - libressl, BoringSSL, GnuTLS, wolfSSL, NSS, mbedTLS, Secure + libressl, BoringSSL, GnuTLS, wolfSSL, NSS, mbedTLS, MesaLink, Secure Transport (native iOS/OS X), Schannel (native Windows), GSKit (native IBM i), BearSSL, or Rustls. They all have their pros and cons, and we try to maintain a comparison of them here: https://curl.se/docs/ssl-compared.html @@ -434,7 +436,7 @@ FAQ 3.1 curl: (1) SSL is disabled, https: not supported - If you get this output when trying to get anything from an https:// server, + If you get this output when trying to get anything from a https:// server, it means that the instance of curl/libcurl that you are using was built without support for this protocol. @@ -493,10 +495,10 @@ FAQ To curl, all contents are alike. It does not matter how the page was generated. It may be ASP, PHP, Perl, shell-script, SSI or plain HTML - files. There is no difference to curl and it does not even know what kind of + files. There's no difference to curl and it does not even know what kind of language that generated the page. - See also item 3.14 regarding JavaScript. + See also item 3.14 regarding javascript. 3.7 Can I use curl to delete/rename a file through FTP? @@ -536,14 +538,14 @@ FAQ about bindings on the curl-library list too, but be prepared that people on that list may not know anything about bindings. - In December 2021, there were interfaces available for the following + In February 2019, there were interfaces available for the following languages: Ada95, Basic, C, C++, Ch, Cocoa, D, Delphi, Dylan, Eiffel, Euphoria, Falcon, Ferite, Gambas, glib/GTK+, Go, Guile, Harbour, Haskell, Java, Julia, Lisp, Lua, Mono, .NET, node.js, Object-Pascal, OCaml, Pascal, Perl, PHP, PostgreSQL, Python, R, Rexx, Ring, RPG, Ruby, Rust, Scheme, Scilab, S-Lang, Smalltalk, SP-Forth, SPL, Tcl, Visual Basic, Visual FoxPro, Q, wxwidgets, XBLite and Xoho. By the time you read this, additional ones - may have appeared. + may have appeared! 3.10 What about SOAP, WebDAV, XML-RPC or similar protocols over HTTP? @@ -564,8 +566,8 @@ FAQ 3.12 Why do FTP-specific features over HTTP proxy fail? - Because when you use an HTTP proxy, the protocol spoken on the network will - be HTTP, even if you specify an FTP URL. This effectively means that you + Because when you use a HTTP proxy, the protocol spoken on the network will + be HTTP, even if you specify a FTP URL. This effectively means that you normally cannot use FTP-specific features such as FTP upload and FTP quote etc. @@ -588,14 +590,7 @@ FAQ Exactly what kind of quotes and how to do this is entirely up to the shell or command line interpreter that you are using. For most unix shells, you can more or less pick either single (') or double (") quotes. For - Windows/DOS command prompts you must use double (") quotes, and if the - option string contains inner double quotes you can escape them with a - backslash. - - For Windows powershell the arguments are not always passed on as expected - because curl is not a powershell script. You may or may not be able to use - single quotes. To escape inner double quotes seems to require a - backslash-backtick escape sequence and the outer quotes as double quotes. + Windows/DOS prompts I believe you are forced to use double (") quotes. Please study the documentation for your particular environment. Examples in the curl docs will use a mix of both of these as shown above. You must @@ -604,27 +599,27 @@ FAQ Remember that curl works and runs on more operating systems than most single individuals have ever tried. - 3.14 Does curl support JavaScript or PAC (automated proxy config)? + 3.14 Does curl support Javascript or PAC (automated proxy config)? - Many web pages do magic stuff using embedded JavaScript. curl and libcurl + Many web pages do magic stuff using embedded Javascript. curl and libcurl have no built-in support for that, so it will be treated just like any other contents. - .pac files are a Netscape invention and are sometimes used by organizations + .pac files are a netscape invention and are sometimes used by organizations to allow them to differentiate which proxies to use. The .pac contents is - just a JavaScript program that gets invoked by the browser and that returns - the name of the proxy to connect to. Since curl does not support JavaScript, + just a Javascript program that gets invoked by the browser and that returns + the name of the proxy to connect to. Since curl does not support Javascript, it cannot support .pac proxy configuration either. - Some workarounds usually suggested to overcome this JavaScript dependency: + Some workarounds usually suggested to overcome this Javascript dependency: - Depending on the JavaScript complexity, write up a script that translates it + Depending on the Javascript complexity, write up a script that translates it to another language and execute that. - Read the JavaScript code and rewrite the same logic in another language. + Read the Javascript code and rewrite the same logic in another language. - Implement a JavaScript interpreter, people have successfully used the - Mozilla JavaScript engine in the past. + Implement a Javascript interpreter, people have successfully used the + Mozilla Javascript engine in the past. Ask your admins to stop this, for a static proxy setup or similar. @@ -645,7 +640,7 @@ FAQ CLIENT CERTIFICATE The server you communicate with may require that you can provide this in - order to prove that you actually are who you claim to be. If the server + order to prove that you actually are who you claim to be. If the server does not require this, you do not need a client certificate. A client certificate is always used together with a private key, and the @@ -675,10 +670,10 @@ FAQ refused access. You then need to explicitly disable the verification to connect to the server. - 3.17 How do I list the root directory of an FTP server? + 3.17 How do I list the root dir of an FTP server? There are two ways. The way defined in the RFC is to use an encoded slash - in the first path part. List the "/tmp" directory like this: + in the first path part. List the "/tmp" dir like this: curl ftp://ftp.sunet.se/%2ftmp/ @@ -691,7 +686,7 @@ FAQ No. - You can easily write your own program using libcurl to do such stunts. + But you could easily write your own program using libcurl to do such stunts. 3.19 How do I get HTTP from a host using a specific IP address? @@ -744,7 +739,7 @@ FAQ In normal circumstances, -X should hardly ever be used. By default you use curl without explicitly saying which request method to - use when the URL identifies an HTTP transfer. If you just pass in a URL like + use when the URL identifies a HTTP transfer. If you just pass in a URL like "curl http://example.com" it will use GET. If you use -d or -F curl will use POST, -I will cause a HEAD and -T will make it a PUT. @@ -772,11 +767,11 @@ FAQ 4.2 Why do I get problems when I use & or % in the URL? - In general Unix shells, the & symbol is treated specially and when used, it + In general unix shells, the & symbol is treated specially and when used, it runs the specified command in the background. To safely send the & as a part of a URL, you should quote the entire URL by using single (') or double (") quotes around it. Similar problems can also occur on some shells with other - characters, including ?*!$~(){}<>\|;`. When in doubt, quote the URL. + characters, including ?*!$~(){}<>\|;`. When in doubt, quote the URL. An example that would invoke a remote CGI that uses &-symbols could be: @@ -814,7 +809,7 @@ FAQ By using the --fail option you can tell curl explicitly to not get any data if the HTTP return code does not say success. - 4.5 Why do I get return code XXX from an HTTP server? + 4.5 Why do I get return code XXX from a HTTP server? RFC2616 clearly explains the return codes. This is a short transcript. Go read the RFC for exact details: @@ -836,7 +831,7 @@ FAQ 4.5.4 "404 Not Found" The server has not found anything matching the Request-URI. No indication - is given as to whether the condition is temporary or permanent. + is given of whether the condition is temporary or permanent. 4.5.5 "405 Method Not Allowed" @@ -863,7 +858,7 @@ FAQ Error codes that are larger than the highest documented error code means that curl has exited due to a crash. This is a serious error, and we appreciate a detailed bug report from you that describes how we could go - ahead and repeat this. + ahead and repeat this! 4.7 How do I keep user names and passwords secret in curl command lines? @@ -887,10 +882,10 @@ FAQ authentication methods (like Digest, Negotiate or even NTLM) or consider the SSL-based alternatives HTTPS and FTPS. - 4.8 I found a bug + 4.8 I found a bug! It is not a bug if the behavior is documented. Read the docs first. - Especially check out the KNOWN_BUGS file, it may be a documented bug. + Especially check out the KNOWN_BUGS file, it may be a documented bug! If it is a problem with a binary you have downloaded or a package for your particular platform, try contacting the person who built the package/archive @@ -899,12 +894,15 @@ FAQ If there is a bug, read the BUGS document first. Then report it as described in there. - 4.9 curl cannot authenticate to a server that requires NTLM? + 4.9 curl cannot authenticate to the server that requires NTLM? NTLM support requires OpenSSL, GnuTLS, mbedTLS, NSS, Secure Transport, or Microsoft Windows libraries at build-time to provide this functionality. - 4.10 My HTTP request using HEAD, PUT or DELETE does not work + NTLM is a Microsoft proprietary protocol. Proprietary formats are evil. You + should not use such ones. + + 4.10 My HTTP request using HEAD, PUT or DELETE does not work! Many web servers allow or demand that the administrator configures the server properly for these requests to work on the web server. @@ -929,10 +927,10 @@ FAQ To completely disable the certificate verification, use -k. This does however enable man-in-the-middle attacks and makes the transfer INSECURE. - We strongly advise against doing this for more than experiments. + We strongly advice against doing this for more than experiments. If you get this failure with a CA cert bundle installed and used, the - server's certificate might not be signed by one of the CA's in your CA + server's certificate might not be signed by one of the CA's in yout CA store. It might for example be self-signed. You then correct this problem by obtaining a valid CA cert for the server. Or again, decrease the security by disabling this check. @@ -958,15 +956,15 @@ FAQ times and it is not easily worked around. For more details read this: https://www.codeproject.com/Articles/1144/Beating-the-Daylight-Savings-Time-bug-and-getting - 4.14 Redirects work in browser but not with curl + 4.14 Redirects work in browser but not with curl! curl supports HTTP redirects well (see item 3.8). Browsers generally support at least two other ways to perform redirects that curl does not: - Meta tags. You can write an HTML tag that will cause the browser to redirect + Meta tags. You can write a HTML tag that will cause the browser to redirect to another given URL after a certain time. - JavaScript. You can write a JavaScript program embedded in an HTML page that + Javascript. You can write a Javascript program embedded in a HTML page that redirects the browser to another given URL. There is no way to make curl follow these redirects. You must either @@ -982,12 +980,12 @@ FAQ the control connection and will therefore immediately connect and try to speak SSL. FTPS:// connections default to port 990. - To use explicit FTPS, you use an FTP:// URL and the --ftp-ssl option (or one + To use explicit FTPS, you use a FTP:// URL and the --ftp-ssl option (or one of its related flavors). This is the most common method, and the one mandated by RFC4217. This kind of connection will then of course use the standard FTP port 21 by default. - 4.16 My HTTP POST or PUT requests are slow + 4.16 My HTTP POST or PUT requests are slow! libcurl makes all POST and PUT requests (except for POST requests with a tiny request body) use the "Expect: 100-continue" header. This header @@ -1007,7 +1005,7 @@ FAQ In most Windows setups having a timeout longer than 21 seconds make no difference, as it will only send 3 TCP SYN packets and no more. The second packet sent three seconds after the first and the third six seconds after - the second. No more than three packets are sent, no matter how long the + the second. No more than three packets are sent, no matter how long the timeout is set. See option TcpMaxConnectRetransmissions on this page: @@ -1051,32 +1049,32 @@ FAQ Unplugging a cable is not an error situation. The TCP/IP protocol stack was designed to be fault tolerant, so even though there may be a physical break somewhere the connection should not be affected, just possibly - delayed. Eventually, the physical break will be fixed or the data will be + delayed. Eventually, the physical break will be fixed or the data will be re-routed around the physical problem through another path. In such cases, the TCP/IP stack is responsible for detecting when the network connection is irrevocably lost. Since with some protocols it is perfectly legal for the client to wait indefinitely for data, the stack may never report a problem, and even when it does, it can take up to 20 minutes - for it to detect an issue. The curl option --keepalive-time enables + for it to detect an issue. The curl option --keepalive-time enables keep-alive support in the TCP/IP stack which makes it periodically probe the connection to make sure it is still available to send data. That should reliably detect any TCP/IP network failure. - TCP keep alive will not detect the network going down before the TCP/IP + But even that will not detect the network going down before the TCP/IP connection is established (e.g. during a DNS lookup) or using protocols that - do not use TCP. To handle those situations, curl offers a number of timeouts + do not use TCP. To handle those situations, curl offers a number of timeouts on its own. --speed-limit/--speed-time will abort if the data transfer rate falls too low, and --connect-timeout and --max-time can be used to put an overall timeout on the connection phase or the entire transfer. A libcurl-using application running in a known physical environment (e.g. an embedded device with only a single network connection) may want to act - immediately if its lone network connection goes down. That can be achieved + immediately if its lone network connection goes down. That can be achieved by having the application monitor the network connection on its own using an OS-specific mechanism, then signaling libcurl to abort (see also item 5.13). - 4.20 curl does not return error for HTTP non-200 responses + 4.20 curl does not return error for HTTP non-200 responses! Correct. Unless you use -f (--fail). @@ -1108,7 +1106,7 @@ FAQ We have written the libcurl code specifically adjusted for multi-threaded programs. libcurl will use thread-safe functions instead of non-safe ones if - your system has such. Note that you must never share the same handle in + your system has such. Note that you must never share the same handle in multiple threads. There may be some exceptions to thread safety depending on how libcurl was @@ -1185,7 +1183,7 @@ FAQ kept within the multi handle and will be shared among all the easy handles that are used within the same multi handle. - 5.7 Link errors when building libcurl on Windows + 5.7 Link errors when building libcurl on Windows! You need to make sure that your project, and all the libraries (both static and dynamic) that it links against, are compiled/linked against the same run @@ -1200,8 +1198,8 @@ FAQ dynamic import symbols. If you are using Visual Studio, you need to instead add CURL_STATICLIB in the "Preprocessor Definitions" section. - If you get a linker error like "unknown symbol __imp__curl_easy_init ..." you - have linked against the wrong (static) library. If you want to use the + If you get linker error like "unknown symbol __imp__curl_easy_init ..." you + have linked against the wrong (static) library. If you want to use the libcurl.dll and import lib, you do not need any extra CFLAGS, but use one of the import libraries below. These are the libraries produced by the various lib/Makefile.* files: @@ -1216,31 +1214,31 @@ FAQ 5.8 libcurl.so.X: open failed: No such file or directory This is an error message you might get when you try to run a program linked - with a shared version of libcurl and your runtime linker (ld.so) could not + with a shared version of libcurl and your run-time linker (ld.so) could not find the shared library named libcurl.so.X. (Where X is the number of the current libcurl ABI, typically 3 or 4). You need to make sure that ld.so finds libcurl.so.X. You can do that - multiple ways, and it differs somewhat between different operating systems. - They are usually: + multiple ways, and it differs somewhat between different operating systems, + but they are usually: * Add an option to the linker command line that specify the hard-coded path - the runtime linker should check for the lib (usually -R) + the run-time linker should check for the lib (usually -R) * Set an environment variable (LD_LIBRARY_PATH for example) where ld.so should check for libs * Adjust the system's config to check for libs in the directory where you have - put the library (like Linux's /etc/ld.so.conf) + put the dir (like Linux's /etc/ld.so.conf) 'man ld.so' and 'man ld' will tell you more details 5.9 How does libcurl resolve host names? - libcurl supports a large number of name resolve functions. One of them is - picked at build-time and will be used unconditionally. Thus, if you want to - change name resolver function you must rebuild libcurl and tell it to use a - different function. + libcurl supports a large a number of different name resolve functions. One + of them is picked at build-time and will be used unconditionally. Thus, if + you want to change name resolver function you must rebuild libcurl and tell + it to use a different function. - The non-IPv6 resolver that can use one of four different host name resolve calls (depending on what your system supports): @@ -1279,7 +1277,7 @@ FAQ No. libcurl operates on a higher level. Besides, faking IP address would imply sending IP packets with a made-up source address, and then you normally get a problem with receiving the packet sent back as they would then not be - routed to you. + routed to you! If you use a proxy to access remote sites, the sites will not see your local IP address but instead the address of the proxy. @@ -1295,7 +1293,7 @@ FAQ one of the callbacks, but none of them are instant. There is no function you can call from another thread or similar that will stop it immediately. Instead, you need to make sure that one of the callbacks you use returns an - appropriate value that will stop the transfer. Suitable callbacks that you + appropriate value that will stop the transfer. Suitable callbacks that you can do this with include the progress callback, the read callback and the write callback. @@ -1329,16 +1327,15 @@ FAQ to list the files. The follow-up question tends to be how is a program supposed to parse the - directory listing. How does it know what's a file and what's a directory and - what's a symlink etc. If the FTP server supports the MLSD command then it - will return data in a machine-readable format that can be parsed for type. - The types are specified by RFC3659 section 7.5.1. If MLSD is not supported - then you have to work with what you are given. The LIST output format is - entirely at the server's own liking and the NLST output does not reveal any - types and in many cases does not even include all the directory entries. - Also, both LIST and NLST tend to hide unix-style hidden files (those that - start with a dot) by default so you need to do "LIST -a" or similar to see - them. + directory listing. How does it know what's a file and what's a dir and what's + a symlink etc. If the FTP server supports the MLSD command then it will + return data in a machine-readable format that can be parsed for type. The + types are specified by RFC3659 section 7.5.1. If MLSD is not supported then + you have to work with what you are given. The LIST output format is entirely + at the server's own liking and the NLST output does not reveal any types and + in many cases does not even include all the directory entries. Also, both LIST + and NLST tend to hide unix-style hidden files (those that start with a dot) + by default so you need to do "LIST -a" or similar to see them. Example - List only directories. ftp.funet.fi supports MLSD and ftp.kernel.org does not: @@ -1354,11 +1351,11 @@ FAQ libcurl since 7.21.0 also provide the ability to specify a wildcard to download multiple files from one FTP directory. - 5.16 I want a different time-out + 5.16 I want a different time-out! - Sometimes users realize that CURLOPT_TIMEOUT and CURLOPT_CONNECTIMEOUT are - not sufficiently advanced or flexible to cover all the various use cases and - scenarios applications end up with. + Time and time again users realize that CURLOPT_TIMEOUT and + CURLOPT_CONNECTIMEOUT are not sufficiently advanced or flexible to cover all + the various use cases and scenarios applications end up with. libcurl offers many more ways to time-out operations. A common alternative is to use the CURLOPT_LOW_SPEED_LIMIT and CURLOPT_LOW_SPEED_TIME options to @@ -1373,11 +1370,11 @@ FAQ 5.17 Can I write a server with libcurl? No. libcurl offers no functions or building blocks to build any kind of - Internet protocol server. libcurl is only a client-side library. For server + internet protocol server. libcurl is only a client-side library. For server libraries, you need to continue your search elsewhere but there exist many - good open source ones out there for most protocols you could want a server - for. There are also really good stand-alone servers that have been tested - and proven for many years. There is no need for you to reinvent them. + good open source ones out there for most protocols you could possibly want a + server for. And there are really good stand-alone ones that have been tested + and proven for many years. There's no need for you to reinvent them! 5.18 Does libcurl use threads? @@ -1385,8 +1382,8 @@ FAQ callbacks will be called in the same thread as the one you call libcurl in. If you want to avoid your thread to be blocked by the libcurl call, you make - sure you use the non-blocking multi API which will do transfers - asynchronously - still in the same single thread. + sure you use the non-blocking API which will do transfers asynchronously - + but still in the same single thread. libcurl will potentially internally use threads for name resolving, if it was built to work like that, but in those cases it will create the child @@ -1408,36 +1405,36 @@ FAQ 6.1 I have a GPL program, can I use the libcurl library? - Yes + Yes! - Since libcurl may be distributed under the MIT/X derivative license, it can - be used together with GPL in any software. + Since libcurl may be distributed under the MIT/X derivative license, it can be + used together with GPL in any software. 6.2 I have a closed-source program, can I use the libcurl library? - Yes + Yes! libcurl does not put any restrictions on the program that uses the library. 6.3 I have a BSD licensed program, can I use the libcurl library? - Yes + Yes! libcurl does not put any restrictions on the program that uses the library. 6.4 I have a program that uses LGPL libraries, can I use libcurl? - Yes + Yes! The LGPL license does not clash with other licenses. 6.5 Can I modify curl/libcurl for my program and keep the changes secret? - Yes + Yes! - The MIT/X derivative license practically allows you to do almost anything - with the sources, on the condition that the copyright texts in the sources - are left intact. + The MIT/X derivative license practically allows you to do almost anything with + the sources, on the condition that the copyright texts in the sources are + left intact. 6.6 Can you please change the curl/libcurl license to XXXX? @@ -1510,7 +1507,7 @@ FAQ 8.1 Why does curl use C89? - As with everything in curl, there is a history and we keep using what we have + As with everything in curl, there's a history and we keep using what we have used before until someone brings up the subject and argues for and works on changing it. @@ -1540,5 +1537,5 @@ FAQ stable, we will never risk anything by rewriting a lot of things in one go. That said, we can certainly offer more and more optional backends written in other languages, as long as those backends can be plugged in at build-time. - Backends can be written in any language, but should probably provide APIs + Back-ends can be written in any language, but should probably provide APIs usable from C to ease integration and transition. diff --git a/3rdparty/curl-7.84.0/docs/FEATURES.md b/3rdparty/curl-7.80.0/docs/FEATURES.md similarity index 89% rename from 3rdparty/curl-7.84.0/docs/FEATURES.md rename to 3rdparty/curl-7.80.0/docs/FEATURES.md index 7451ee63..38e2ac3e 100644 --- a/3rdparty/curl-7.84.0/docs/FEATURES.md +++ b/3rdparty/curl-7.80.0/docs/FEATURES.md @@ -22,7 +22,7 @@ - "standard" proxy environment variables support - compiles on win32 (reported builds on 70+ operating systems) - selectable network interface for outgoing traffic - - IPv6 support on Unix and Windows + - IPv6 support on unix and Windows - happy eyeballs dual-stack connects - persistent connections - SOCKS 4 + 5 support, with or without local name resolving @@ -31,7 +31,7 @@ - replaceable memory functions (malloc, free, realloc, etc) - asynchronous name resolving (6) - both a push and a pull style interface - - international domain names (10) + - international domain names (11) ## HTTP @@ -51,7 +51,7 @@ - maximum amount of redirects to follow - custom HTTP request - cookie get/send fully parsed - - reads/writes the Netscape cookie file format + - reads/writes the netscape cookie file format - custom headers (replace/remove internally generated headers) - custom user-agent string - custom referrer string @@ -62,7 +62,7 @@ - retrieve file modification date - Content-Encoding support for deflate and gzip - "Transfer-Encoding: chunked" support in uploads - - automatic data compression (11) + - automatic data compression (12) ## HTTPS (1) @@ -78,7 +78,7 @@ - download - authentication - - Kerberos 5 (12) + - Kerberos 5 (13) - active/passive using PORT, EPRT, PASV or EPSV - single file size information (compare to HTTP HEAD) - 'type=' URL support @@ -147,7 +147,7 @@ - authentication: Plain, Login, CRAM-MD5, Digest-MD5, NTLM (9), Kerberos 5 (4) and External. - - send emails + - send e-mails - mail from support - mail size support - mail auth support for trusted server-to-server relaying @@ -165,8 +165,8 @@ - authentication: Clear Text, APOP and SASL - SASL based authentication: Plain, Login, CRAM-MD5, Digest-MD5, NTLM (9), Kerberos 5 (4) and External. - - list emails - - retrieve emails + - list e-mails + - retrieve e-mails - enhanced command support for: CAPA, DELE, TOP, STAT, UIDL and NOOP via custom requests - via http-proxy @@ -184,8 +184,8 @@ Kerberos 5 (4) and External. - list the folders of a mailbox - select a mailbox with support for verifying the UIDVALIDITY - - fetch emails with support for specifying the UID and SECTION - - upload emails via the append command + - fetch e-mails with support for specifying the UID and SECTION + - upload e-mails via the append command - enhanced command support for: EXAMINE, CREATE, DELETE, RENAME, STATUS, STORE, COPY and UID via custom requests - via http-proxy @@ -198,7 +198,7 @@ ## MQTT - - Subscribe to and publish topics using URL scheme `mqtt://broker/topic` + - Subscribe to and publish topics using url scheme `mqtt://broker/topic` ## Footnotes @@ -212,8 +212,9 @@ 6. requires c-ares 7. requires libssh2, libssh or wolfSSH 8. requires libssh2 or libssh - 9. requires OpenSSL, GnuTLS, mbedTLS, NSS, Secure Transport or SSPI + 9. requires OpenSSL, GnuTLS, mbedTLS, NSS, yassl, Secure Transport or SSPI (native Windows) - 10. requires libidn2 or Windows - 11. requires libz, brotli and/or zstd - 12. requires a GSS-API implementation (such as Heimdal or MIT Kerberos) + 10. - + 11. requires libidn2 or Windows + 12. requires libz, brotli and/or zstd + 13. requires a GSS-API implementation (such as Heimdal or MIT Kerberos) diff --git a/3rdparty/curl-7.84.0/docs/GOVERNANCE.md b/3rdparty/curl-7.80.0/docs/GOVERNANCE.md similarity index 97% rename from 3rdparty/curl-7.84.0/docs/GOVERNANCE.md rename to 3rdparty/curl-7.80.0/docs/GOVERNANCE.md index 0d6c5b2d..fd778b39 100644 --- a/3rdparty/curl-7.84.0/docs/GOVERNANCE.md +++ b/3rdparty/curl-7.80.0/docs/GOVERNANCE.md @@ -8,7 +8,7 @@ This project was started by and has to some extent been pushed forward over the years with Daniel Stenberg as the driving force. It matches a standard BDFL (Benevolent Dictator For Life) style project. -This setup has been used due to convenience and the fact that it has worked +This setup has been used due to convenience and the fact that is has worked fine this far. It is not because someone thinks of it as a superior project leadership model. It will also only continue working as long as Daniel manages to listen in to what the project and the general user population wants and @@ -45,7 +45,7 @@ non-profit organization that holds on to funds for us. This fund is then used for paying the curl security bug bounties, to reimburse project related expenses etc. -Donations to the project can also come in the form of server hosting, providing +Donations to the project can also come in form of server hosting, providing services and paying for people to work on curl related code etc. Usually, such donations are services paid for directly by the sponsors. @@ -159,7 +159,7 @@ When you are merging patches/PRs... necessary - avoid the "merge" button on GitHub, do it "manually" instead to get full control and full audit trail (github leaves out you as "Committer:") -- remember to credit the reporter and the helpers. +- remember to credit the reporter and the helpers! ## Who are maintainers? diff --git a/3rdparty/curl-7.84.0/docs/HELP-US.md b/3rdparty/curl-7.80.0/docs/HELP-US.md similarity index 97% rename from 3rdparty/curl-7.84.0/docs/HELP-US.md rename to 3rdparty/curl-7.80.0/docs/HELP-US.md index eabf8081..64c08d80 100644 --- a/3rdparty/curl-7.84.0/docs/HELP-US.md +++ b/3rdparty/curl-7.80.0/docs/HELP-US.md @@ -28,7 +28,7 @@ even maybe not a terribly experienced developer, here's our advice: - Read through this document to get a grasp on a general approach to use - Consider adding a test case for something not currently tested (correctly) - Consider updating or adding documentation - - One way to get started gently in the project, is to participate in an + - One way to get your feet wet gently in the project, is to participate in an existing issue/PR and help out by reproducing the issue, review the code in the PR etc. @@ -84,4 +84,4 @@ the specific implementation. Either way is fine. We offer [guidelines](https://curl.se/dev/contribute.html) that are suitable to be familiar with before you decide to contribute to curl. If you are used to open source development, you will probably not find many -surprises there. +surprises in there. diff --git a/3rdparty/curl-7.84.0/docs/HISTORY.md b/3rdparty/curl-7.80.0/docs/HISTORY.md similarity index 95% rename from 3rdparty/curl-7.84.0/docs/HISTORY.md rename to 3rdparty/curl-7.80.0/docs/HISTORY.md index 6268b87e..12af639c 100644 --- a/3rdparty/curl-7.84.0/docs/HISTORY.md +++ b/3rdparty/curl-7.80.0/docs/HISTORY.md @@ -26,7 +26,7 @@ command line. HttpGet 1.0 was released on April 8th 1997 with brand new HTTP proxy support. -We soon found and fixed support for getting currencies over GOPHER. Once FTP +We soon found and fixed support for getting currencies over GOPHER. Once FTP download support was added, the name of the project was changed and urlget 2.0 was released in August 1997. The http-only days were already passed. @@ -145,7 +145,7 @@ June: the curl website gets 13000 visits weekly. curl and libcurl is 35000 lines of code. Reported successful compiles on more than 40 combinations of CPUs and operating systems. -To estimate the number of users of the curl tool or libcurl library is next to +To estimate number of users of the curl tool or libcurl library is next to impossible. Around 5000 downloaded packages each week from the main site gives a hint, but the packages are mirrored extensively, bundled with numerous OS distributions and otherwise retrieved as part of other software. @@ -406,27 +406,9 @@ April: added the cyassl backend (later renamed to WolfSSL) November: the website moves to curl.se. The website serves 10TB data monthly. - December: alt-svc support - 2021 ---- - February 3: curl 7.75.0 ships with support for Hyper as an HTTP backend + February 3: curl 7.75.0 ships with support for Hyper is a HTTP backend March 31: curl 7.76.0 ships with support for rustls - - July: HSTS is supported - -2022 ----- - - March: added --json, removed mesalink support - - Public curl releases: 206 - Command line options: 245 - curl_easy_setopt() options: 295 - Public functions in libcurl: 86 - Contributors: 2601 - - The curl.se website serves 16,500 GB/month over 462M requests, the - official docker image has been pulled 4,098,015,431 times. diff --git a/3rdparty/curl-7.84.0/docs/HSTS.md b/3rdparty/curl-7.80.0/docs/HSTS.md similarity index 94% rename from 3rdparty/curl-7.84.0/docs/HSTS.md rename to 3rdparty/curl-7.80.0/docs/HSTS.md index cecdc75c..f63cfe32 100644 --- a/3rdparty/curl-7.84.0/docs/HSTS.md +++ b/3rdparty/curl-7.80.0/docs/HSTS.md @@ -5,7 +5,7 @@ HTTP Strict-Transport-Security. Added as experimental in curl ## Standard -[HTTP Strict Transport Security](https://datatracker.ietf.org/doc/html/rfc6797) +[HTTP Strict Transport Security](https://tools.ietf.org/html/rfc6797) ## Behavior diff --git a/3rdparty/curl-7.84.0/docs/HTTP-COOKIES.md b/3rdparty/curl-7.80.0/docs/HTTP-COOKIES.md similarity index 82% rename from 3rdparty/curl-7.84.0/docs/HTTP-COOKIES.md rename to 3rdparty/curl-7.80.0/docs/HTTP-COOKIES.md index 73fa242b..c7c116b1 100644 --- a/3rdparty/curl-7.84.0/docs/HTTP-COOKIES.md +++ b/3rdparty/curl-7.80.0/docs/HTTP-COOKIES.md @@ -2,7 +2,7 @@ ## Cookie overview - Cookies are `name=contents` pairs that an HTTP server tells the client to + Cookies are `name=contents` pairs that a HTTP server tells the client to hold and then the client sends back those to the server on subsequent requests to the same domains and paths for which the cookies were set. @@ -20,12 +20,12 @@ In 2011, [RFC6265](https://www.ietf.org/rfc/rfc6265.txt) was finally published and details how cookies work within HTTP. In 2016, an update which added support for prefixes was - [proposed](https://datatracker.ietf.org/doc/html/draft-ietf-httpbis-cookie-prefixes-00), + [proposed](https://tools.ietf.org/html/draft-ietf-httpbis-cookie-prefixes-00), and in 2017, another update was - [drafted](https://datatracker.ietf.org/doc/html/draft-ietf-httpbis-cookie-alone-01) + [drafted](https://tools.ietf.org/html/draft-ietf-httpbis-cookie-alone-01) to deprecate modification of 'secure' cookies from non-secure origins. Both of these drafts have been incorporated into a proposal to - [replace](https://datatracker.ietf.org/doc/html/draft-ietf-httpbis-rfc6265bis-02) + [replace](https://tools.ietf.org/html/draft-ietf-httpbis-rfc6265bis-02) RFC6265. Cookie prefixes and secure cookie modification protection has been implemented by curl. @@ -36,7 +36,7 @@ sharing the cookies with browsers, only to see browsers move away from that format. Modern browsers no longer use it, while curl still does. - The Netscape cookie file format stores one cookie per physical line in the + The netscape cookie file format stores one cookie per physical line in the file with a bunch of associated meta data, each field separated with TAB. That file is called the cookiejar in curl terminology. @@ -111,28 +111,23 @@ `CURLOPT_COOKIELIST` Provide detailed information about a single cookie to add to the internal - storage of cookies. Pass in the cookie as an HTTP header with all the - details set, or pass in a line from a Netscape cookie file. This option can - also be used to flush the cookies etc. - - `CURLOPT_COOKIESESSION` - - Tell libcurl to ignore all cookies it is about to load that are session - cookies. + storage of cookies. Pass in the cookie as a HTTP header with all the details + set, or pass in a line from a netscape cookie file. This option can also be + used to flush the cookies etc. `CURLINFO_COOKIELIST` Extract cookie information from the internal cookie storage as a linked list. -## Cookies with JavaScript +## Cookies with javascript - These days a lot of the web is built up by JavaScript. The webbrowser loads - complete programs that render the page you see. These JavaScript programs + These days a lot of the web is built up by javascript. The webbrowser loads + complete programs that render the page you see. These javascript programs can also set and access cookies. Since curl and libcurl are plain HTTP clients without any knowledge of or - capability to handle JavaScript, such cookies will not be detected or used. + capability to handle javascript, such cookies will not be detected or used. Often, if you want to mimic what a browser does on such websites, you can record web browser HTTP traffic when using such a site and then repeat the diff --git a/3rdparty/curl-7.84.0/docs/HTTP2.md b/3rdparty/curl-7.80.0/docs/HTTP2.md similarity index 95% rename from 3rdparty/curl-7.84.0/docs/HTTP2.md rename to 3rdparty/curl-7.80.0/docs/HTTP2.md index 35b45ed2..7ab5dfdc 100644 --- a/3rdparty/curl-7.84.0/docs/HTTP2.md +++ b/3rdparty/curl-7.80.0/docs/HTTP2.md @@ -77,7 +77,7 @@ To take advantage of multiplexing, you need to use the multi interface and set attempt to re-use existing HTTP/2 connections and just add a new stream over that when doing subsequent parallel requests. -While libcurl sets up a connection to an HTTP server there is a period during +While libcurl sets up a connection to a HTTP server there is a period during which it does not know if it can pipeline or do multiplexing and if you add new transfers in that period, libcurl will default to start new connections for those transfers. With the new option `CURLOPT_PIPEWAIT` (added in 7.43.0), you @@ -114,8 +114,8 @@ HTTP Alternative Services Alt-Svc is an extension with a corresponding frame (ALTSVC) in HTTP/2 that tells the client about an alternative "route" to the same content for the same origin server that you get the response from. A browser or long-living client -can use that hint to create a new connection asynchronously. For libcurl, we +can use that hint to create a new connection asynchronously. For libcurl, we may introduce a way to bring such clues to the application and/or let a subsequent request use the alternate route automatically. -[Detailed in RFC 7838](https://datatracker.ietf.org/doc/html/rfc7838) +[Detailed in RFC 7838](https://tools.ietf.org/html/rfc7838) diff --git a/3rdparty/curl-7.80.0/docs/HTTP3.md b/3rdparty/curl-7.80.0/docs/HTTP3.md new file mode 100644 index 00000000..4853e8da --- /dev/null +++ b/3rdparty/curl-7.80.0/docs/HTTP3.md @@ -0,0 +1,149 @@ +# HTTP3 (and QUIC) + +## Resources + +[HTTP/3 Explained](https://http3-explained.haxx.se/en/) - the online free +book describing the protocols involved. + +[QUIC implementation](https://github.com/curl/curl/wiki/QUIC-implementation) - +the wiki page describing the plan for how to support QUIC and HTTP/3 in curl +and libcurl. + +[quicwg.org](https://quicwg.org/) - home of the official protocol drafts + +## QUIC libraries + +QUIC libraries we are experimenting with: + +[ngtcp2](https://github.com/ngtcp2/ngtcp2) + +[quiche](https://github.com/cloudflare/quiche) + +## Experimental! + +HTTP/3 and QUIC support in curl is considered **EXPERIMENTAL** until further +notice. It needs to be enabled at build-time. + +Further development and tweaking of the HTTP/3 support in curl will happen in +in the master branch using pull-requests, just like ordinary changes. + +# ngtcp2 version + +## Build with OpenSSL + +Build (patched) OpenSSL + + % git clone --depth 1 -b openssl-3.0.0+quic https://github.com/quictls/openssl + % cd openssl + % ./config enable-tls1_3 --prefix= + % make + % make install + +Build nghttp3 + + % cd .. + % git clone https://github.com/ngtcp2/nghttp3 + % cd nghttp3 + % autoreconf -fi + % ./configure --prefix= --enable-lib-only + % make + % make install + +Build ngtcp2 + + % cd .. + % git clone https://github.com/ngtcp2/ngtcp2 + % cd ngtcp2 + % autoreconf -fi + % ./configure PKG_CONFIG_PATH=/lib/pkgconfig:/lib/pkgconfig LDFLAGS="-Wl,-rpath,/lib" --prefix= --enable-lib-only + % make + % make install + +Build curl + + % cd .. + % git clone https://github.com/curl/curl + % cd curl + % autoreconf -fi + % LDFLAGS="-Wl,-rpath,/lib" ./configure --with-openssl= --with-nghttp3= --with-ngtcp2= + % make + % make install + +For OpenSSL 3.0.0 or later builds on Linux for x86_64 architecture, substitute all occurances of "/lib" with "/lib64" + +## Build with GnuTLS + +Build GnuTLS + + % git clone --depth 1 https://gitlab.com/gnutls/gnutls.git + % cd gnutls + % ./bootstrap + % ./configure --prefix= + % make + % make install + +Build nghttp3 + + % cd .. + % git clone https://github.com/ngtcp2/nghttp3 + % cd nghttp3 + % autoreconf -fi + % ./configure --prefix= --enable-lib-only + % make + % make install + +Build ngtcp2 + + % cd .. + % git clone https://github.com/ngtcp2/ngtcp2 + % cd ngtcp2 + % autoreconf -fi + % ./configure PKG_CONFIG_PATH=/lib/pkgconfig:/lib/pkgconfig LDFLAGS="-Wl,-rpath,/lib" --prefix= --enable-lib-only --with-gnutls + % make + % make install + +Build curl + + % cd .. + % git clone https://github.com/curl/curl + % cd curl + % autoreconf -fi + % ./configure --without-openssl --with-gnutls= --with-nghttp3= --with-ngtcp2= + % make + % make install + +# quiche version + +## build + +Build quiche and BoringSSL: + + % git clone --recursive https://github.com/cloudflare/quiche + % cd quiche + % cargo build --release --features ffi,pkg-config-meta,qlog + % mkdir deps/boringssl/src/lib + % ln -vnf $(find target/release -name libcrypto.a -o -name libssl.a) deps/boringssl/src/lib/ + +Build curl: + + % cd .. + % git clone https://github.com/curl/curl + % cd curl + % autoreconf -fi + % ./configure LDFLAGS="-Wl,-rpath,$PWD/../quiche/target/release" --with-openssl=$PWD/../quiche/deps/boringssl/src --with-quiche=$PWD/../quiche/target/release + % make + % make install + + If `make install` results in `Permission denied` error, you will need to prepend it with `sudo`. + +## Run + +Use HTTP/3 directly: + + curl --http3 https://nghttp2.org:4433/ + +Upgrade via Alt-Svc: + + curl --alt-svc altsvc.cache https://quic.aiortc.org/ + +See this [list of public HTTP/3 servers](https://bagder.github.io/HTTP3-test/) diff --git a/3rdparty/curl-7.84.0/docs/HYPER.md b/3rdparty/curl-7.80.0/docs/HYPER.md similarity index 81% rename from 3rdparty/curl-7.84.0/docs/HYPER.md rename to 3rdparty/curl-7.80.0/docs/HYPER.md index ad23a903..0ca1ce1d 100644 --- a/3rdparty/curl-7.84.0/docs/HYPER.md +++ b/3rdparty/curl-7.80.0/docs/HYPER.md @@ -18,22 +18,17 @@ The C API for Hyper is brand new and is still under development. ## build curl with hyper -Since March 3 2022, hyper needs the nightly rustc to build, which you may need -to install first with: - - % rustup toolchain install nightly - -Then build hyper and enable its C API like this: +Build hyper and enable the C API: % git clone https://github.com/hyperium/hyper % cd hyper - % RUSTFLAGS="--cfg hyper_unstable_ffi" cargo +nightly rustc --features client,http1,http2,ffi -Z unstable-options --crate-type cdylib + % RUSTFLAGS="--cfg hyper_unstable_ffi" cargo build --features client,http1,http2,ffi Build curl to use hyper's C API: % git clone https://github.com/curl/curl % cd curl - % autoreconf -fi + % ./buildconf % ./configure --with-hyper= % make @@ -56,9 +51,8 @@ The hyper backend does not support - `CURLOPT_IGNORE_CONTENT_LENGTH` - `--raw` and disabling `CURLOPT_HTTP_TRANSFER_DECODING` - RTSP -- hyper is much stricter about what HTTP header contents it allows +- hyper is much stricter about what HTTP header contents it allow in requests - HTTP/0.9 -- HTTP/2 upgrade using HTTP:// URLs. Aka 'h2c' ## Remaining issues diff --git a/3rdparty/curl-7.84.0/docs/INSTALL b/3rdparty/curl-7.80.0/docs/INSTALL similarity index 100% rename from 3rdparty/curl-7.84.0/docs/INSTALL rename to 3rdparty/curl-7.80.0/docs/INSTALL diff --git a/3rdparty/curl-7.84.0/docs/INSTALL.cmake b/3rdparty/curl-7.80.0/docs/INSTALL.cmake similarity index 100% rename from 3rdparty/curl-7.84.0/docs/INSTALL.cmake rename to 3rdparty/curl-7.80.0/docs/INSTALL.cmake diff --git a/3rdparty/curl-7.84.0/docs/INSTALL.md b/3rdparty/curl-7.80.0/docs/INSTALL.md similarity index 83% rename from 3rdparty/curl-7.84.0/docs/INSTALL.md rename to 3rdparty/curl-7.80.0/docs/INSTALL.md index 03d73843..ed8ca286 100644 --- a/3rdparty/curl-7.84.0/docs/INSTALL.md +++ b/3rdparty/curl-7.80.0/docs/INSTALL.md @@ -79,14 +79,14 @@ have OpenSSL installed in your system, you can run configure like this: If you have OpenSSL installed, but with the libraries in one place and the header files somewhere else, you have to set the `LDFLAGS` and `CPPFLAGS` -environment variables prior to running configure. Something like this should +environment variables prior to running configure. Something like this should work: CPPFLAGS="-I/path/to/ssl/include" LDFLAGS="-L/path/to/ssl/lib" ./configure -If you have shared SSL libs installed in a directory where your runtime +If you have shared SSL libs installed in a directory where your run-time linker does not find them (which usually causes configure failures), you can -provide this option to gcc to set a hard-coded path to the runtime linker: +provide this option to gcc to set a hard-coded path to the run-time linker: LDFLAGS=-Wl,-R/usr/local/ssl/lib ./configure --with-openssl @@ -111,12 +111,13 @@ want to alter it, you can select how to deal with each individual library. ## Select TLS backend -These options are provided to select the TLS backend to use. +These options are provided to select TLS backend to use. - AmiSSL: `--with-amissl` - BearSSL: `--with-bearssl` - GnuTLS: `--with-gnutls`. - mbedTLS: `--with-mbedtls` + - MesaLink: `--with-mesalink` - NSS: `--with-nss` - OpenSSL: `--with-openssl` (also for BoringSSL and libressl) - rustls: `--with-rustls` @@ -126,7 +127,7 @@ These options are provided to select the TLS backend to use. # Windows -## Building Windows DLLs and C runtime (CRT) linkage issues +## Building Windows DLLs and C run-time (CRT) linkage issues As a general rule, building a DLL with static CRT linkage is highly discouraged, and intermixing CRTs in the same app is something to avoid at @@ -149,7 +150,7 @@ debug multithreaded dynamic C runtime. ## MingW32 -Make sure that MinGW32's bin directory is in the search path, for example: +Make sure that MinGW32's bin dir is in the search path, for example: ```cmd set PATH=c:\mingw32\bin;%PATH% @@ -194,7 +195,7 @@ If you want to enable LDAPS support then set LDAPS=1. ## Cygwin -Almost identical to the Unix installation. Run the configure script in the +Almost identical to the unix installation. Run the configure script in the curl source tree root with `sh configure`. Make sure you have the `sh` executable in `/bin/` or you will see the configure fail toward the end. @@ -217,23 +218,25 @@ If you want to set any of these defines you have the following options: - Modify the "Preprocessor Definitions" in the libcurl project Note: The pre-processor settings can be found using the Visual Studio IDE -under "Project -> Properties -> Configuration Properties -> C/C++ -> -Preprocessor". +under "Project -> Settings -> C/C++ -> General" in VC6 and "Project -> +Properties -> Configuration Properties -> C/C++ -> Preprocessor" in later +versions. ## Using BSD-style lwIP instead of Winsock TCP/IP stack in Win32 builds In order to compile libcurl and curl using BSD-style lwIP TCP/IP stack it is -necessary to make the definition of the preprocessor symbol `USE_LWIPSOCK` -visible to libcurl and curl compilation processes. To set this definition you -have the following alternatives: +necessary to make definition of preprocessor symbol `USE_LWIPSOCK` visible to +libcurl and curl compilation processes. To set this definition you have the +following alternatives: - Modify `lib/config-win32.h` and `src/config-win32.h` - Modify `winbuild/Makefile.vc` - Modify the "Preprocessor Definitions" in the libcurl project Note: The pre-processor settings can be found using the Visual Studio IDE -under "Project -> Properties -> Configuration Properties -> C/C++ -> -Preprocessor". +under "Project -> Settings -> C/C++ -> General" in VC6 and "Project -> +Properties -> Configuration Properties -> C/C++ -> Preprocessor" in later +versions. Once that libcurl has been built with BSD-style lwIP TCP/IP stack support, in order to use it with your program it is mandatory that your program includes @@ -252,7 +255,7 @@ might yet need some additional adjustment, caveat emptor. ## Important static libcurl usage note When building an application that uses the static libcurl library on Windows, -you must add `-DCURL_STATICLIB` to your `CFLAGS`. Otherwise the linker will +you must add `-DCURL_STATICLIB` to your `CFLAGS`. Otherwise the linker will look for dynamic import symbols. ## Legacy Windows and SSL @@ -321,8 +324,7 @@ make -j8 make install ``` -In all above, the built libraries and executables can be found in the -`artifacts` folder. +In all above, the built libraries and executables can be found in `artifacts` folder. # Android @@ -388,13 +390,13 @@ they affect both environments. By default, jobs in IBM i will not start with threading enabled. (Exceptions include interactive PASE sessions started by `QP2TERM` or SSH.) If you use curl in an environment without threading when options like async DNS were -enabled, you will get messages like: +enabled, you will messages like: ``` getaddrinfo() thread failed to start ``` -Do not panic. curl and your program are not broken. You can fix this by: +Do not panic! curl and your program are not broken. You can fix this by: - Set the environment variable `QIBM_MULTI_THREADED` to `Y` before starting your program. This can be done at whatever scope you feel is appropriate. @@ -407,8 +409,8 @@ Download and unpack the curl package. `cd` to the new directory. (e.g. `cd curl-7.12.3`) Set environment variables to point to the cross-compile toolchain and call -configure with any options you need. Be sure and specify the `--host` and -`--build` parameters at configuration time. The following script is an +configure with any options you need. Be sure and specify the `--host` and +`--build` parameters at configuration time. The following script is an example of cross-compiling for the IBM 405GP PowerPC processor using the toolchain from MonteVista for Hardhat Linux. @@ -433,8 +435,8 @@ export NM=ppc_405-nm You may also need to provide a parameter like `--with-random=/dev/urandom` to configure as it cannot detect the presence of a random number generating -device for a target system. The `--prefix` parameter specifies where curl -will be installed. If `configure` completes successfully, do `make` and `make +device for a target system. The `--prefix` parameter specifies where curl +will be installed. If `configure` completes successfully, do `make` and `make install` as usual. In some cases, you may be able to simplify the above commands to as little as: @@ -446,7 +448,7 @@ In some cases, you may be able to simplify the above commands to as little as: There are a number of configure options that can be used to reduce the size of libcurl for embedded applications where binary size is an important factor. First, be sure to set the `CFLAGS` variable when configuring with any relevant -compiler optimization flags to reduce the size of the binary. For gcc, this +compiler optimization flags to reduce the size of the binary. For gcc, this would mean at minimum the -Os option, and potentially the `-march=X`, `-mdynamic-no-pic` and `-flto` options as well, e.g. @@ -457,45 +459,24 @@ due to improved optimization. Be sure to specify as many `--disable-` and `--without-` flags on the configure command-line as you can to disable all the libcurl features that you -know your application is not going to need. Besides specifying the +know your application is not going to need. Besides specifying the `--disable-PROTOCOL` flags for all the types of URLs your application will not -use, here are some other flags that can reduce the size of the library by -disabling support for some feature: - - - `--disable-alt-svc` (HTTP Alt-Srv) - - `--disable-ares` (the C-ARES DNS library) - - `--disable-cookies` (HTTP cookies) - - `--disable-crypto-auth` (cryptographic authentication) - - `--disable-dateparse` (date parsing for time conditionals) - - `--disable-dnsshuffle` (internal server load spreading) - - `--disable-doh` (DNS-over-HTTP) - - `--disable-get-easy-options` (lookup easy options at runtime) - - `--disable-hsts` (HTTP Strict Transport Security) - - `--disable-http-auth` (all HTTP authentication) - - `--disable-ipv6` (IPv6) - - `--disable-libcurl-option` (--libcurl C code generation support) - - `--disable-manual` (built-in documentation) - - `--disable-netrc` (.netrc file) - - `--disable-ntlm-wb` (NTLM WinBind) - - `--disable-progress-meter` (graphical progress meter in library) - - `--disable-proxy` (HTTP and SOCKS proxies) - - `--disable-pthreads` (multithreading) - - `--disable-socketpair` (socketpair for async name resolving) - - `--disable-threaded-resolver` (threaded name resolver) - - `--disable-tls-srp` (Secure Remote Password authentication for TLS) - - `--disable-unix-sockets` (UNIX sockets) +use, here are some other flags that can reduce the size of the library: + + - `--disable-ares` (disables support for the C-ARES DNS library) + - `--disable-cookies` (disables support for HTTP cookies) + - `--disable-crypto-auth` (disables HTTP cryptographic authentication) + - `--disable-ipv6` (disables support for IPv6) + - `--disable-manual` (disables support for the built-in documentation) + - `--disable-proxy` (disables support for HTTP and SOCKS proxies) + - `--disable-unix-sockets` (disables support for UNIX sockets) - `--disable-verbose` (eliminates debugging strings and error code strings) - - `--disable-versioned-symbols` (versioned symbols) + - `--disable-versioned-symbols` (disables support for versioned symbols) - `--enable-symbol-hiding` (eliminates unneeded symbols in the shared library) - - `--without-brotli` (Brotli on-the-fly decompression) - - `--without-libpsl` (Public Suffix List in cookies) - - `--without-nghttp2` (HTTP/2 using nghttp2) - - `--without-ngtcp2` (HTTP/2 using ngtcp2) - - `--without-zstd` (Zstd on-the-fly decompression) - - `--without-libidn2` (internationalized domain names) - - `--without-librtmp` (RTMP) - - `--without-ssl` (SSL/TLS) - - `--without-zlib` (on-the-fly decompression) + - `--without-libidn` (disables support for the libidn DNS library) + - `--without-librtmp` (disables support for RTMP) + - `--without-openssl` (disables support for SSL/TLS) + - `--without-zlib` (disables support for on-the-fly decompression) The GNU compiler and linker have a number of options that can reduce the size of the libcurl dynamic libraries on some platforms even further. @@ -507,28 +488,27 @@ the configure command-line, e.g. LDFLAGS="-Wl,-s -Wl,-Bsymbolic -Wl,--gc-sections" Be sure also to strip debugging symbols from your binaries after compiling -using 'strip' (or the appropriate variant if cross-compiling). If space is +using 'strip' (or the appropriate variant if cross-compiling). If space is really tight, you may be able to remove some unneeded sections of the shared library using the -R option to objcopy (e.g. the .comment section). -Using these techniques it is possible to create a basic HTTP-only libcurl -shared library for i386 Linux platforms that is only 133 KiB in size -(as of libcurl version 7.80.0, using gcc 11.2.0). +Using these techniques it is possible to create a basic HTTP-only shared +libcurl library for i386 Linux platforms that is only 113 KiB in size, and an +FTP-only library that is 113 KiB in size (as of libcurl version 7.50.3, using +gcc 5.4.0). You may find that statically linking libcurl to your application will result in a lower total size than dynamically linking. Note that the curl test harness can detect the use of some, but not all, of the `--disable` statements suggested above. Use will cause tests relying on -those features to fail. The test harness can be manually forced to skip the +those features to fail. The test harness can be manually forced to skip the relevant tests by specifying certain key words on the `runtests.pl` command -line. Following is a list of appropriate key words for those configure options -that are not automatically detected: +line. Following is a list of appropriate key words: - `--disable-cookies` !cookies - - `--disable-dateparse` !RETRY-AFTER !CURLOPT_TIMECONDITION !CURLINFO_FILETIME !If-Modified-Since !getdate !-z - - `--disable-libcurl-option` !--libcurl - - `--disable-verbose` !verbose\ logs + - `--disable-manual` !--manual + - `--disable-proxy` !HTTP\ proxy !proxytunnel !SOCKS4 !SOCKS5 # PORTS diff --git a/3rdparty/curl-7.80.0/docs/INTERNALS.md b/3rdparty/curl-7.80.0/docs/INTERNALS.md new file mode 100644 index 00000000..9c50b146 --- /dev/null +++ b/3rdparty/curl-7.80.0/docs/INTERNALS.md @@ -0,0 +1,1106 @@ +curl internals +============== + + - [Intro](#intro) + - [git](#git) + - [Portability](#Portability) + - [Windows vs Unix](#winvsunix) + - [Library](#Library) + - [`Curl_connect`](#Curl_connect) + - [`multi_do`](#multi_do) + - [`Curl_readwrite`](#Curl_readwrite) + - [`multi_done`](#multi_done) + - [`Curl_disconnect`](#Curl_disconnect) + - [HTTP(S)](#http) + - [FTP](#ftp) + - [Kerberos](#kerberos) + - [TELNET](#telnet) + - [FILE](#file) + - [SMB](#smb) + - [LDAP](#ldap) + - [E-mail](#email) + - [General](#general) + - [Persistent Connections](#persistent) + - [multi interface/non-blocking](#multi) + - [SSL libraries](#ssl) + - [Library Symbols](#symbols) + - [Return Codes and Informationals](#returncodes) + - [AP/ABI](#abi) + - [Client](#client) + - [Memory Debugging](#memorydebug) + - [Test Suite](#test) + - [Asynchronous name resolves](#asyncdns) + - [c-ares](#cares) + - [`curl_off_t`](#curl_off_t) + - [curlx](#curlx) + - [Content Encoding](#contentencoding) + - [`hostip.c` explained](#hostip) + - [Track Down Memory Leaks](#memoryleak) + - [`multi_socket`](#multi_socket) + - [Structs in libcurl](#structs) + - [Curl_easy](#Curl_easy) + - [connectdata](#connectdata) + - [Curl_multi](#Curl_multi) + - [Curl_handler](#Curl_handler) + - [conncache](#conncache) + - [Curl_share](#Curl_share) + - [CookieInfo](#CookieInfo) + + +Intro +===== + + This project is split in two. The library and the client. The client part + uses the library, but the library is designed to allow other applications to + use it. + + The largest amount of code and complexity is in the library part. + + + +git +=== + + All changes to the sources are committed to the git repository as soon as + they are somewhat verified to work. Changes shall be committed as independently + as possible so that individual changes can be easily spotted and tracked + afterwards. + + Tagging shall be used extensively, and by the time we release new archives we + should tag the sources with a name similar to the released version number. + + +Portability +=========== + + We write curl and libcurl to compile with C89 compilers. On 32-bit and up + machines. Most of libcurl assumes more or less POSIX compliance but that is + not a requirement. + + We write libcurl to build and work with lots of third party tools, and we + want it to remain functional and buildable with these and later versions + (older versions may still work but is not what we work hard to maintain): + +Dependencies +------------ + + - OpenSSL 0.9.7 + - GnuTLS 3.1.10 + - zlib 1.1.4 + - libssh2 1.0 + - c-ares 1.16.0 + - libidn2 2.0.0 + - wolfSSL 2.0.0 + - openldap 2.0 + - MIT Kerberos 1.2.4 + - GSKit V5R3M0 + - NSS 3.14.x + - Heimdal ? + - nghttp2 1.12.0 + - WinSock 2.2 (on Windows 95+ and Windows CE .NET 4.1+) + +Operating Systems +----------------- + + On systems where configure runs, we aim at working on them all - if they have + a suitable C compiler. On systems that do not run configure, we strive to keep + curl running correctly on: + + - Windows 98 + - AS/400 V5R3M0 + - Symbian 9.1 + - Windows CE ? + - TPF ? + +Build tools +----------- + + When writing code (mostly for generating stuff included in release tarballs) + we use a few "build tools" and we make sure that we remain functional with + these versions: + + - GNU Libtool 1.4.2 + - GNU Autoconf 2.57 + - GNU Automake 1.7 + - GNU M4 1.4 + - perl 5.004 + - roffit 0.5 + - groff ? (any version that supports `groff -Tps -man [in] [out]`) + - ps2pdf (gs) ? + + +Windows vs Unix +=============== + + There are a few differences in how to program curl the Unix way compared to + the Windows way. Perhaps the four most notable details are: + + 1. Different function names for socket operations. + + In curl, this is solved with defines and macros, so that the source looks + the same in all places except for the header file that defines them. The + macros in use are `sclose()`, `sread()` and `swrite()`. + + 2. Windows requires a couple of init calls for the socket stuff. + + That is taken care of by the `curl_global_init()` call, but if other libs + also do it etc there might be reasons for applications to alter that + behavior. + + We require WinSock version 2.2 and load this version during global init. + + 3. The file descriptors for network communication and file operations are + not as easily interchangeable as in Unix. + + We avoid this by not trying any funny tricks on file descriptors. + + 4. When writing data to stdout, Windows makes end-of-lines the DOS way, thus + destroying binary data, although you do want that conversion if it is + text coming through... (sigh) + + We set stdout to binary under windows + + Inside the source code, We make an effort to avoid `#ifdef [Your OS]`. All + conditionals that deal with features *should* instead be in the format + `#ifdef HAVE_THAT_WEIRD_FUNCTION`. Since Windows cannot run configure scripts, + we maintain a `curl_config-win32.h` file in lib directory that is supposed to + look exactly like a `curl_config.h` file would have looked like on a Windows + machine! + + Generally speaking: always remember that this will be compiled on dozens of + operating systems. Do not walk on the edge! + + +Library +======= + + (See [Structs in libcurl](#structs) for the separate section describing all + major internal structs and their purposes.) + + There are plenty of entry points to the library, namely each publicly defined + function that libcurl offers to applications. All of those functions are + rather small and easy-to-follow. All the ones prefixed with `curl_easy` are + put in the `lib/easy.c` file. + + `curl_global_init()` and `curl_global_cleanup()` should be called by the + application to initialize and clean up global stuff in the library. As of + today, it can handle the global SSL initialization if SSL is enabled and it + can initialize the socket layer on Windows machines. libcurl itself has no + "global" scope. + + All printf()-style functions use the supplied clones in `lib/mprintf.c`. This + makes sure we stay absolutely platform independent. + + [ `curl_easy_init()`][2] allocates an internal struct and makes some + initializations. The returned handle does not reveal internals. This is the + `Curl_easy` struct which works as an "anchor" struct for all `curl_easy` + functions. All connections performed will get connect-specific data allocated + that should be used for things related to particular connections/requests. + + [`curl_easy_setopt()`][1] takes three arguments, where the option stuff must + be passed in pairs: the parameter-ID and the parameter-value. The list of + options is documented in the man page. This function mainly sets things in + the `Curl_easy` struct. + + `curl_easy_perform()` is just a wrapper function that makes use of the multi + API. It basically calls `curl_multi_init()`, `curl_multi_add_handle()`, + `curl_multi_wait()`, and `curl_multi_perform()` until the transfer is done + and then returns. + + Some of the most important key functions in `url.c` are called from + `multi.c` when certain key steps are to be made in the transfer operation. + + +Curl_connect() +-------------- + + Analyzes the URL, it separates the different components and connects to the + remote host. This may involve using a proxy and/or using SSL. The + `Curl_resolv()` function in `lib/hostip.c` is used for looking up host + names (it does then use the proper underlying method, which may vary + between platforms and builds). + + When `Curl_connect` is done, we are connected to the remote site. Then it + is time to tell the server to get a document/file. `Curl_do()` arranges + this. + + This function makes sure there's an allocated and initiated `connectdata` + struct that is used for this particular connection only (although there may + be several requests performed on the same connect). A bunch of things are + initialized/inherited from the `Curl_easy` struct. + + +multi_do() +--------- + + `multi_do()` makes sure the proper protocol-specific function is called. + The functions are named after the protocols they handle. + + The protocol-specific functions of course deal with protocol-specific + negotiations and setup. When they are ready to start the actual file + transfer they call the `Curl_setup_transfer()` function (in + `lib/transfer.c`) to setup the transfer and returns. + + If this DO function fails and the connection is being re-used, libcurl will + then close this connection, setup a new connection and re-issue the DO + request on that. This is because there is no way to be perfectly sure that + we have discovered a dead connection before the DO function and thus we + might wrongly be re-using a connection that was closed by the remote peer. + + +Curl_readwrite() +---------------- + + Called during the transfer of the actual protocol payload. + + During transfer, the progress functions in `lib/progress.c` are called at + frequent intervals (or at the user's choice, a specified callback might get + called). The speedcheck functions in `lib/speedcheck.c` are also used to + verify that the transfer is as fast as required. + + +multi_done() +----------- + + Called after a transfer is done. This function takes care of everything + that has to be done after a transfer. This function attempts to leave + matters in a state so that `multi_do()` should be possible to call again on + the same connection (in a persistent connection case). It might also soon + be closed with `Curl_disconnect()`. + + +Curl_disconnect() +----------------- + + When doing normal connections and transfers, no one ever tries to close any + connections so this is not normally called when `curl_easy_perform()` is + used. This function is only used when we are certain that no more transfers + are going to be made on the connection. It can be also closed by force, or + it can be called to make sure that libcurl does not keep too many + connections alive at the same time. + + This function cleans up all resources that are associated with a single + connection. + + +HTTP(S) +======= + + HTTP offers a lot and is the protocol in curl that uses the most lines of + code. There is a special file `lib/formdata.c` that offers all the + multipart post functions. + + base64-functions for user+password stuff (and more) is in `lib/base64.c` + and all functions for parsing and sending cookies are found in + `lib/cookie.c`. + + HTTPS uses in almost every case the same procedure as HTTP, with only two + exceptions: the connect procedure is different and the function used to read + or write from the socket is different, although the latter fact is hidden in + the source by the use of `Curl_read()` for reading and `Curl_write()` for + writing data to the remote server. + + `http_chunks.c` contains functions that understands HTTP 1.1 chunked transfer + encoding. + + An interesting detail with the HTTP(S) request, is the `Curl_add_buffer()` + series of functions we use. They append data to one single buffer, and when + the building is finished the entire request is sent off in one single write. + This is done this way to overcome problems with flawed firewalls and lame + servers. + + +FTP +=== + + The `Curl_if2ip()` function can be used for getting the IP number of a + specified network interface, and it resides in `lib/if2ip.c`. + + `Curl_ftpsendf()` is used for sending FTP commands to the remote server. It + was made a separate function to prevent us programmers from forgetting that + they must be CRLF terminated. They must also be sent in one single `write()` + to make firewalls and similar happy. + + +Kerberos +======== + + Kerberos support is mainly in `lib/krb5.c` but also `curl_sasl_sspi.c` and + `curl_sasl_gssapi.c` for the email protocols and `socks_gssapi.c` and + `socks_sspi.c` for SOCKS5 proxy specifics. + + +TELNET +====== + + Telnet is implemented in `lib/telnet.c`. + + +FILE +==== + + The `file://` protocol is dealt with in `lib/file.c`. + + +SMB +=== + + The `smb://` protocol is dealt with in `lib/smb.c`. + + +LDAP +==== + + Everything LDAP is in `lib/ldap.c` and `lib/openldap.c`. + + +E-mail +====== + + The e-mail related source code is in `lib/imap.c`, `lib/pop3.c` and + `lib/smtp.c`. + + +General +======= + + URL encoding and decoding, called escaping and unescaping in the source code, + is found in `lib/escape.c`. + + While transferring data in `Transfer()` a few functions might get used. + `curl_getdate()` in `lib/parsedate.c` is for HTTP date comparisons (and + more). + + `lib/getenv.c` offers `curl_getenv()` which is for reading environment + variables in a neat platform independent way. That is used in the client, but + also in `lib/url.c` when checking the proxy environment variables. Note that + contrary to the normal unix `getenv()`, this returns an allocated buffer that + must be `free()`ed after use. + + `lib/netrc.c` holds the `.netrc` parser. + + `lib/timeval.c` features replacement functions for systems that do not have + `gettimeofday()` and a few support functions for timeval conversions. + + A function named `curl_version()` that returns the full curl version string + is found in `lib/version.c`. + + +Persistent Connections +====================== + + The persistent connection support in libcurl requires some considerations on + how to do things inside of the library. + + - The `Curl_easy` struct returned in the [`curl_easy_init()`][2] call + must never hold connection-oriented data. It is meant to hold the root data + as well as all the options etc that the library-user may choose. + + - The `Curl_easy` struct holds the "connection cache" (an array of + pointers to `connectdata` structs). + + - This enables the 'curl handle' to be reused on subsequent transfers. + + - When libcurl is told to perform a transfer, it first checks for an already + existing connection in the cache that we can use. Otherwise it creates a + new one and adds that to the cache. If the cache is full already when a new + connection is added, it will first close the oldest unused one. + + - When the transfer operation is complete, the connection is left + open. Particular options may tell libcurl not to, and protocols may signal + closure on connections and then they will not be kept open, of course. + + - When `curl_easy_cleanup()` is called, we close all still opened connections, + unless of course the multi interface "owns" the connections. + + The curl handle must be re-used in order for the persistent connections to + work. + + +multi interface/non-blocking +============================ + + The multi interface is a non-blocking interface to the library. To make that + interface work as well as possible, no low-level functions within libcurl + must be written to work in a blocking manner. (There are still a few spots + violating this rule.) + + One of the primary reasons we introduced c-ares support was to allow the name + resolve phase to be perfectly non-blocking as well. + + The FTP and the SFTP/SCP protocols are examples of how we adapt and adjust + the code to allow non-blocking operations even on multi-stage command- + response protocols. They are built around state machines that return when + they would otherwise block waiting for data. The DICT, LDAP and TELNET + protocols are crappy examples and they are subject for rewrite in the future + to better fit the libcurl protocol family. + + +SSL libraries +============= + + Originally libcurl supported SSLeay for SSL/TLS transports, but that was then + extended to its successor OpenSSL but has since also been extended to several + other SSL/TLS libraries and we expect and hope to further extend the support + in future libcurl versions. + + To deal with this internally in the best way possible, we have a generic SSL + function API as provided by the `vtls/vtls.[ch]` system, and they are the only + SSL functions we must use from within libcurl. vtls is then crafted to use + the appropriate lower-level function calls to whatever SSL library that is in + use. For example `vtls/openssl.[ch]` for the OpenSSL library. + + +Library Symbols +=============== + + All symbols used internally in libcurl must use a `Curl_` prefix if they are + used in more than a single file. Single-file symbols must be made static. + Public ("exported") symbols must use a `curl_` prefix. (There are exceptions, + but they are to be changed to follow this pattern in future versions.) Public + API functions are marked with `CURL_EXTERN` in the public header files so + that all others can be hidden on platforms where this is possible. + + +Return Codes and Informationals +=============================== + + I have made things simple. Almost every function in libcurl returns a CURLcode, + that must be `CURLE_OK` if everything is OK or otherwise a suitable error + code as the `curl/curl.h` include file defines. The place that detects an + error must use the `Curl_failf()` function to set the human-readable error + description. + + In aiding the user to understand what's happening and to debug curl usage, we + must supply a fair number of informational messages by using the + `Curl_infof()` function. Those messages are only displayed when the user + explicitly asks for them. They are best used when revealing information that + is not otherwise obvious. + + +API/ABI +======= + + We make an effort to not export or show internals or how internals work, as + that makes it easier to keep a solid API/ABI over time. See docs/libcurl/ABI + for our promise to users. + + +Client +====== + + `main()` resides in `src/tool_main.c`. + + `src/tool_hugehelp.c` is automatically generated by the `mkhelp.pl` perl + script to display the complete "manual" and the `src/tool_urlglob.c` file + holds the functions used for the URL-"globbing" support. Globbing in the + sense that the `{}` and `[]` expansion stuff is there. + + The client mostly sets up its `config` struct properly, then + it calls the `curl_easy_*()` functions of the library and when it gets back + control after the `curl_easy_perform()` it cleans up the library, checks + status and exits. + + When the operation is done, the `ourWriteOut()` function in `src/writeout.c` + may be called to report about the operation. That function is mostly using the + `curl_easy_getinfo()` function to extract useful information from the curl + session. + + It may loop and do all this several times if many URLs were specified on the + command line or config file. + + +Memory Debugging +================ + + The file `lib/memdebug.c` contains debug-versions of a few functions. + Functions such as `malloc()`, `free()`, `fopen()`, `fclose()`, etc that + somehow deal with resources that might give us problems if we "leak" them. + The functions in the memdebug system do nothing fancy, they do their normal + function and then log information about what they just did. The logged data + can then be analyzed after a complete session, + + `memanalyze.pl` is the perl script present in `tests/` that analyzes a log + file generated by the memory tracking system. It detects if resources are + allocated but never freed and other kinds of errors related to resource + management. + + Internally, definition of preprocessor symbol `DEBUGBUILD` restricts code + which is only compiled for debug enabled builds. And symbol `CURLDEBUG` is + used to differentiate code which is _only_ used for memory + tracking/debugging. + + Use `-DCURLDEBUG` when compiling to enable memory debugging, this is also + switched on by running configure with `--enable-curldebug`. Use + `-DDEBUGBUILD` when compiling to enable a debug build or run configure with + `--enable-debug`. + + `curl --version` will list 'Debug' feature for debug enabled builds, and + will list 'TrackMemory' feature for curl debug memory tracking capable + builds. These features are independent and can be controlled when running + the configure script. When `--enable-debug` is given both features will be + enabled, unless some restriction prevents memory tracking from being used. + + +Test Suite +========== + + The test suite is placed in its own subdirectory directly off the root in the + curl archive tree, and it contains a bunch of scripts and a lot of test case + data. + + The main test script is `runtests.pl` that will invoke test servers like + `httpserver.pl` and `ftpserver.pl` before all the test cases are performed. + The test suite currently only runs on Unix-like platforms. + + you will find a description of the test suite in the `tests/README` file, and + the test case data files in the `tests/FILEFORMAT` file. + + The test suite automatically detects if curl was built with the memory + debugging enabled, and if it was, it will detect memory leaks, too. + + +Asynchronous name resolves +========================== + + libcurl can be built to do name resolves asynchronously, using either the + normal resolver in a threaded manner or by using c-ares. + + +[c-ares][3] +------ + +### Build libcurl to use a c-ares + +1. ./configure --enable-ares=/path/to/ares/install +2. make + +### c-ares on win32 + + First I compiled c-ares. I changed the default C runtime library to be the + single-threaded rather than the multi-threaded (this seems to be required to + prevent linking errors later on). Then I simply build the areslib project + (the other projects adig/ahost seem to fail under MSVC). + + Next was libcurl. I opened `lib/config-win32.h` and I added a: + `#define USE_ARES 1` + + Next thing I did was I added the path for the ares includes to the include + path, and the libares.lib to the libraries. + + Lastly, I also changed libcurl to be single-threaded rather than + multi-threaded, again this was to prevent some duplicate symbol errors. I'm + not sure why I needed to change everything to single-threaded, but when I + did not I got redefinition errors for several CRT functions (`malloc()`, + `stricmp()`, etc.) + + +`curl_off_t` +========== + + `curl_off_t` is a data type provided by the external libcurl include + headers. It is the type meant to be used for the [`curl_easy_setopt()`][1] + options that end with LARGE. The type is 64-bit large on most modern + platforms. + + +curlx +===== + + The libcurl source code offers a few functions by source only. They are not + part of the official libcurl API, but the source files might be useful for + others so apps can optionally compile/build with these sources to gain + additional functions. + + We provide them through a single header file for easy access for apps: + `curlx.h` + +`curlx_strtoofft()` +------------------- + A macro that converts a string containing a number to a `curl_off_t` number. + This might use the `curlx_strtoll()` function which is provided as source + code in strtoofft.c. Note that the function is only provided if no + `strtoll()` (or equivalent) function exist on your platform. If `curl_off_t` + is only a 32-bit number on your platform, this macro uses `strtol()`. + +Future +------ + + Several functions will be removed from the public `curl_` name space in a + future libcurl release. They will then only become available as `curlx_` + functions instead. To make the transition easier, we already today provide + these functions with the `curlx_` prefix to allow sources to be built + properly with the new function names. The concerned functions are: + + - `curlx_getenv` + - `curlx_strequal` + - `curlx_strnequal` + - `curlx_mvsnprintf` + - `curlx_msnprintf` + - `curlx_maprintf` + - `curlx_mvaprintf` + - `curlx_msprintf` + - `curlx_mprintf` + - `curlx_mfprintf` + - `curlx_mvsprintf` + - `curlx_mvprintf` + - `curlx_mvfprintf` + + +Content Encoding +================ + +## About content encodings + + [HTTP/1.1][4] specifies that a client may request that a server encode its + response. This is usually used to compress a response using one (or more) + encodings from a set of commonly available compression techniques. These + schemes include `deflate` (the zlib algorithm), `gzip`, `br` (brotli) and + `compress`. A client requests that the server perform an encoding by including + an `Accept-Encoding` header in the request document. The value of the header + should be one of the recognized tokens `deflate`, ... (there's a way to + register new schemes/tokens, see sec 3.5 of the spec). A server MAY honor + the client's encoding request. When a response is encoded, the server + includes a `Content-Encoding` header in the response. The value of the + `Content-Encoding` header indicates which encodings were used to encode the + data, in the order in which they were applied. + + It's also possible for a client to attach priorities to different schemes so + that the server knows which it prefers. See sec 14.3 of RFC 2616 for more + information on the `Accept-Encoding` header. See sec + [3.1.2.2 of RFC 7231][15] for more information on the `Content-Encoding` + header. + +## Supported content encodings + + The `deflate`, `gzip` and `br` content encodings are supported by libcurl. + Both regular and chunked transfers work fine. The zlib library is required + for the `deflate` and `gzip` encodings, while the brotli decoding library is + for the `br` encoding. + +## The libcurl interface + + To cause libcurl to request a content encoding use: + + [`curl_easy_setopt`][1](curl, [`CURLOPT_ACCEPT_ENCODING`][5], string) + + where string is the intended value of the `Accept-Encoding` header. + + Currently, libcurl does support multiple encodings but only + understands how to process responses that use the `deflate`, `gzip` and/or + `br` content encodings, so the only values for [`CURLOPT_ACCEPT_ENCODING`][5] + that will work (besides `identity`, which does nothing) are `deflate`, + `gzip` and `br`. If a response is encoded using the `compress` or methods, + libcurl will return an error indicating that the response could + not be decoded. If `` is NULL no `Accept-Encoding` header is + generated. If `` is a zero-length string, then an `Accept-Encoding` + header containing all supported encodings will be generated. + + The [`CURLOPT_ACCEPT_ENCODING`][5] must be set to any non-NULL value for + content to be automatically decoded. If it is not set and the server still + sends encoded content (despite not having been asked), the data is returned + in its raw form and the `Content-Encoding` type is not checked. + +## The curl interface + + Use the [`--compressed`][6] option with curl to cause it to ask servers to + compress responses using any format supported by curl. + + +`hostip.c` explained +==================== + + The main compile-time defines to keep in mind when reading the `host*.c` + source file are these: + +## `CURLRES_IPV6` + + this host has `getaddrinfo()` and family, and thus we use that. The host may + not be able to resolve IPv6, but we do not really have to take that into + account. Hosts that are not IPv6-enabled have `CURLRES_IPV4` defined. + +## `CURLRES_ARES` + + is defined if libcurl is built to use c-ares for asynchronous name + resolves. This can be Windows or \*nix. + +## `CURLRES_THREADED` + + is defined if libcurl is built to use threading for asynchronous name + resolves. The name resolve will be done in a new thread, and the supported + asynch API will be the same as for ares-builds. This is the default under + (native) Windows. + + If any of the two previous are defined, `CURLRES_ASYNCH` is defined too. If + libcurl is not built to use an asynchronous resolver, `CURLRES_SYNCH` is + defined. + +## `host*.c` sources + + The `host*.c` sources files are split up like this: + + - `hostip.c` - method-independent resolver functions and utility functions + - `hostasyn.c` - functions for asynchronous name resolves + - `hostsyn.c` - functions for synchronous name resolves + - `asyn-ares.c` - functions for asynchronous name resolves using c-ares + - `asyn-thread.c` - functions for asynchronous name resolves using threads + - `hostip4.c` - IPv4 specific functions + - `hostip6.c` - IPv6 specific functions + + The `hostip.h` is the single united header file for all this. It defines the + `CURLRES_*` defines based on the `config*.h` and `curl_setup.h` defines. + + +Track Down Memory Leaks +======================= + +## Single-threaded + + Please note that this memory leak system is not adjusted to work in more + than one thread. If you want/need to use it in a multi-threaded app. Please + adjust accordingly. + +## Build + + Rebuild libcurl with `-DCURLDEBUG` (usually, rerunning configure with + `--enable-debug` fixes this). `make clean` first, then `make` so that all + files are actually rebuilt properly. It will also make sense to build + libcurl with the debug option (usually `-g` to the compiler) so that + debugging it will be easier if you actually do find a leak in the library. + + This will create a library that has memory debugging enabled. + +## Modify Your Application + + Add a line in your application code: + +```c + curl_dbg_memdebug("dump"); +``` + + This will make the malloc debug system output a full trace of all resource + using functions to the given file name. Make sure you rebuild your program + and that you link with the same libcurl you built for this purpose as + described above. + +## Run Your Application + + Run your program as usual. Watch the specified memory trace file grow. + + Make your program exit and use the proper libcurl cleanup functions etc. So + that all non-leaks are returned/freed properly. + +## Analyze the Flow + + Use the `tests/memanalyze.pl` perl script to analyze the dump file: + + tests/memanalyze.pl dump + + This now outputs a report on what resources that were allocated but never + freed etc. This report is fine for posting to the list! + + If this does not produce any output, no leak was detected in libcurl. Then + the leak is mostly likely to be in your code. + + +`multi_socket` +============== + + Implementation of the `curl_multi_socket` API + + The main ideas of this API are simply: + + 1. The application can use whatever event system it likes as it gets info + from libcurl about what file descriptors libcurl waits for what action + on. (The previous API returns `fd_sets` which is `select()`-centric). + + 2. When the application discovers action on a single socket, it calls + libcurl and informs that there was action on this particular socket and + libcurl can then act on that socket/transfer only and not care about + any other transfers. (The previous API always had to scan through all + the existing transfers.) + + The idea is that [`curl_multi_socket_action()`][7] calls a given callback + with information about what socket to wait for what action on, and the + callback only gets called if the status of that socket has changed. + + We also added a timer callback that makes libcurl call the application when + the timeout value changes, and you set that with [`curl_multi_setopt()`][9] + and the [`CURLMOPT_TIMERFUNCTION`][10] option. To get this to work, + Internally, there's an added struct to each easy handle in which we store + an "expire time" (if any). The structs are then "splay sorted" so that we + can add and remove times from the linked list and yet somewhat swiftly + figure out both how long there is until the next nearest timer expires + and which timer (handle) we should take care of now. Of course, the upside + of all this is that we get a [`curl_multi_timeout()`][8] that should also + work with old-style applications that use [`curl_multi_perform()`][11]. + + We created an internal "socket to easy handles" hash table that given + a socket (file descriptor) returns the easy handle that waits for action on + that socket. This hash is made using the already existing hash code + (previously only used for the DNS cache). + + To make libcurl able to report plain sockets in the socket callback, we had + to re-organize the internals of the [`curl_multi_fdset()`][12] etc so that + the conversion from sockets to `fd_sets` for that function is only done in + the last step before the data is returned. I also had to extend c-ares to + get a function that can return plain sockets, as that library too returned + only `fd_sets` and that is no longer good enough. The changes done to c-ares + are available in c-ares 1.3.1 and later. + + +Structs in libcurl +================== + +This section should cover 7.32.0 pretty accurately, but will make sense even +for older and later versions as things do not change drastically that often. + + +## Curl_easy + + The `Curl_easy` struct is the one returned to the outside in the external API + as a `CURL *`. This is usually known as an easy handle in API documentations + and examples. + + Information and state that is related to the actual connection is in the + `connectdata` struct. When a transfer is about to be made, libcurl will + either create a new connection or re-use an existing one. The particular + connectdata that is used by this handle is pointed out by + `Curl_easy->easy_conn`. + + Data and information that regard this particular single transfer is put in + the `SingleRequest` sub-struct. + + When the `Curl_easy` struct is added to a multi handle, as it must be in + order to do any transfer, the `->multi` member will point to the `Curl_multi` + struct it belongs to. The `->prev` and `->next` members will then be used by + the multi code to keep a linked list of `Curl_easy` structs that are added to + that same multi handle. libcurl always uses multi so `->multi` *will* point + to a `Curl_multi` when a transfer is in progress. + + `->mstate` is the multi state of this particular `Curl_easy`. When + `multi_runsingle()` is called, it will act on this handle according to which + state it is in. The mstate is also what tells which sockets to return for a + specific `Curl_easy` when [`curl_multi_fdset()`][12] is called etc. + + The libcurl source code generally use the name `data` for the variable that + points to the `Curl_easy`. + + When doing multiplexed HTTP/2 transfers, each `Curl_easy` is associated with + an individual stream, sharing the same connectdata struct. Multiplexing + makes it even more important to keep things associated with the right thing! + + +## connectdata + + A general idea in libcurl is to keep connections around in a connection + "cache" after they have been used in case they will be used again and then + re-use an existing one instead of creating a new as it creates a significant + performance boost. + + Each `connectdata` identifies a single physical connection to a server. If + the connection cannot be kept alive, the connection will be closed after use + and then this struct can be removed from the cache and freed. + + Thus, the same `Curl_easy` can be used multiple times and each time select + another `connectdata` struct to use for the connection. Keep this in mind, + as it is then important to consider if options or choices are based on the + connection or the `Curl_easy`. + + Functions in libcurl will assume that `connectdata->data` points to the + `Curl_easy` that uses this connection (for the moment). + + As a special complexity, some protocols supported by libcurl require a + special disconnect procedure that is more than just shutting down the + socket. It can involve sending one or more commands to the server before + doing so. Since connections are kept in the connection cache after use, the + original `Curl_easy` may no longer be around when the time comes to shut down + a particular connection. For this purpose, libcurl holds a special dummy + `closure_handle` `Curl_easy` in the `Curl_multi` struct to use when needed. + + FTP uses two TCP connections for a typical transfer but it keeps both in + this single struct and thus can be considered a single connection for most + internal concerns. + + The libcurl source code generally use the name `conn` for the variable that + points to the connectdata. + + +## Curl_multi + + Internally, the easy interface is implemented as a wrapper around multi + interface functions. This makes everything multi interface. + + `Curl_multi` is the multi handle struct exposed as `CURLM *` in external + APIs. + + This struct holds a list of `Curl_easy` structs that have been added to this + handle with [`curl_multi_add_handle()`][13]. The start of the list is + `->easyp` and `->num_easy` is a counter of added `Curl_easy`s. + + `->msglist` is a linked list of messages to send back when + [`curl_multi_info_read()`][14] is called. Basically a node is added to that + list when an individual `Curl_easy`'s transfer has completed. + + `->hostcache` points to the name cache. It is a hash table for looking up + name to IP. The nodes have a limited life time in there and this cache is + meant to reduce the time for when the same name is wanted within a short + period of time. + + `->timetree` points to a tree of `Curl_easy`s, sorted by the remaining time + until it should be checked - normally some sort of timeout. Each `Curl_easy` + has one node in the tree. + + `->sockhash` is a hash table to allow fast lookups of socket descriptor for + which `Curl_easy` uses that descriptor. This is necessary for the + `multi_socket` API. + + `->conn_cache` points to the connection cache. It keeps track of all + connections that are kept after use. The cache has a maximum size. + + `->closure_handle` is described in the `connectdata` section. + + The libcurl source code generally use the name `multi` for the variable that + points to the `Curl_multi` struct. + + +## Curl_handler + + Each unique protocol that is supported by libcurl needs to provide at least + one `Curl_handler` struct. It defines what the protocol is called and what + functions the main code should call to deal with protocol specific issues. + In general, there's a source file named `[protocol].c` in which there's a + `struct Curl_handler Curl_handler_[protocol]` declared. In `url.c` there's + then the main array with all individual `Curl_handler` structs pointed to + from a single array which is scanned through when a URL is given to libcurl + to work with. + + The concrete function pointer prototypes can be found in `lib/urldata.h`. + + `->scheme` is the URL scheme name, usually spelled out in uppercase. That is + "HTTP" or "FTP" etc. SSL versions of the protocol need their own + `Curl_handler` setup so HTTPS separate from HTTP. + + `->setup_connection` is called to allow the protocol code to allocate + protocol specific data that then gets associated with that `Curl_easy` for + the rest of this transfer. It gets freed again at the end of the transfer. + It will be called before the `connectdata` for the transfer has been + selected/created. Most protocols will allocate its private `struct + [PROTOCOL]` here and assign `Curl_easy->req.p.[protocol]` to it. + + `->connect_it` allows a protocol to do some specific actions after the TCP + connect is done, that can still be considered part of the connection phase. + + Some protocols will alter the `connectdata->recv[]` and + `connectdata->send[]` function pointers in this function. + + `->connecting` is similarly a function that keeps getting called as long as + the protocol considers itself still in the connecting phase. + + `->do_it` is the function called to issue the transfer request. What we call + the DO action internally. If the DO is not enough and things need to be kept + getting done for the entire DO sequence to complete, `->doing` is then + usually also provided. Each protocol that needs to do multiple commands or + similar for do/doing need to implement their own state machines (see SCP, + SFTP, FTP). Some protocols (only FTP and only due to historical reasons) has + a separate piece of the DO state called `DO_MORE`. + + `->doing` keeps getting called while issuing the transfer request command(s) + + `->done` gets called when the transfer is complete and DONE. That is after the + main data has been transferred. + + `->do_more` gets called during the `DO_MORE` state. The FTP protocol uses + this state when setting up the second connection. + + `->proto_getsock` + `->doing_getsock` + `->domore_getsock` + `->perform_getsock` + Functions that return socket information. Which socket(s) to wait for which + I/O action(s) during the particular multi state. + + `->disconnect` is called immediately before the TCP connection is shutdown. + + `->readwrite` gets called during transfer to allow the protocol to do extra + reads/writes + + `->attach` attaches a transfer to the connection. + + `->defport` is the default report TCP or UDP port this protocol uses + + `->protocol` is one or more bits in the `CURLPROTO_*` set. The SSL versions + have their "base" protocol set and then the SSL variation. Like + "HTTP|HTTPS". + + `->flags` is a bitmask with additional information about the protocol that will + make it get treated differently by the generic engine: + + - `PROTOPT_SSL` - will make it connect and negotiate SSL + + - `PROTOPT_DUAL` - this protocol uses two connections + + - `PROTOPT_CLOSEACTION` - this protocol has actions to do before closing the + connection. This flag is no longer used by code, yet still set for a bunch + of protocol handlers. + + - `PROTOPT_DIRLOCK` - "direction lock". The SSH protocols set this bit to + limit which "direction" of socket actions that the main engine will + concern itself with. + + - `PROTOPT_NONETWORK` - a protocol that does not use network (read `file:`) + + - `PROTOPT_NEEDSPWD` - this protocol needs a password and will use a default + one unless one is provided + + - `PROTOPT_NOURLQUERY` - this protocol cannot handle a query part on the URL + (?foo=bar) + + +## conncache + + Is a hash table with connections for later re-use. Each `Curl_easy` has a + pointer to its connection cache. Each multi handle sets up a connection + cache that all added `Curl_easy`s share by default. + + +## Curl_share + + The libcurl share API allocates a `Curl_share` struct, exposed to the + external API as `CURLSH *`. + + The idea is that the struct can have a set of its own versions of caches and + pools and then by providing this struct in the `CURLOPT_SHARE` option, those + specific `Curl_easy`s will use the caches/pools that this share handle + holds. + + Then individual `Curl_easy` structs can be made to share specific things + that they otherwise would not, such as cookies. + + The `Curl_share` struct can currently hold cookies, DNS cache and the SSL + session cache. + + +## CookieInfo + + This is the main cookie struct. It holds all known cookies and related + information. Each `Curl_easy` has its own private `CookieInfo` even when + they are added to a multi handle. They can be made to share cookies by using + the share API. + + +[1]: https://curl.se/libcurl/c/curl_easy_setopt.html +[2]: https://curl.se/libcurl/c/curl_easy_init.html +[3]: https://c-ares.org/ +[4]: https://tools.ietf.org/html/rfc7230 "RFC 7230" +[5]: https://curl.se/libcurl/c/CURLOPT_ACCEPT_ENCODING.html +[6]: https://curl.se/docs/manpage.html#--compressed +[7]: https://curl.se/libcurl/c/curl_multi_socket_action.html +[8]: https://curl.se/libcurl/c/curl_multi_timeout.html +[9]: https://curl.se/libcurl/c/curl_multi_setopt.html +[10]: https://curl.se/libcurl/c/CURLMOPT_TIMERFUNCTION.html +[11]: https://curl.se/libcurl/c/curl_multi_perform.html +[12]: https://curl.se/libcurl/c/curl_multi_fdset.html +[13]: https://curl.se/libcurl/c/curl_multi_add_handle.html +[14]: https://curl.se/libcurl/c/curl_multi_info_read.html +[15]: https://tools.ietf.org/html/rfc7231#section-3.1.2.2 diff --git a/3rdparty/curl-7.84.0/docs/KNOWN_BUGS b/3rdparty/curl-7.80.0/docs/KNOWN_BUGS similarity index 89% rename from 3rdparty/curl-7.84.0/docs/KNOWN_BUGS rename to 3rdparty/curl-7.80.0/docs/KNOWN_BUGS index 67197cf6..910db4dd 100644 --- a/3rdparty/curl-7.84.0/docs/KNOWN_BUGS +++ b/3rdparty/curl-7.80.0/docs/KNOWN_BUGS @@ -7,9 +7,9 @@ Known Bugs These are problems and bugs known to exist at the time of this release. Feel -free to join in and help us correct one or more of these. Also be sure to +free to join in and help us correct one or more of these! Also be sure to check the changelog of the current development status, as one or more of these -problems may have been fixed or changed somewhat since this was written. +problems may have been fixed or changed somewhat since this was written! 1. HTTP 1.2 Multiple methods in a single WWW-Authenticate: header @@ -54,11 +54,10 @@ problems may have been fixed or changed somewhat since this was written. 5.3 curl compiled on OSX 10.13 failed to run on OSX 10.10 5.4 Build with statically built dependency 5.5 cannot handle Unicode arguments in non-Unicode builds on Windows - 5.6 make distclean loops forever 5.7 Visual Studio project gaps 5.8 configure finding libs in wrong directory 5.9 Utilize Requires.private directives in libcurl.pc - 5.10 curl hangs on SMB upload over stdin + 5.10 SMB tests fail with Python 2 5.11 configure --with-gssapi with Heimdal is ignored on macOS 5.12 flaky Windows CI builds @@ -108,6 +107,7 @@ problems may have been fixed or changed somewhat since this was written. 11.3 Disconnects do not do verbose 11.4 HTTP test server 'connection-monitor' problems 11.5 Connection information when using TCP Fast Open + 11.6 slow connect to localhost on Windows 11.7 signal-based resolver timeouts 11.8 DoH leaks memory after followlocation 11.9 DoH does not inherit all transfer options @@ -127,7 +127,6 @@ problems may have been fixed or changed somewhat since this was written. 13. TCP/IP 13.1 --interface for ipv6 binds to unusable IP address - 13.2 Trying local ports fails on Windows 14. DICT 14.1 DICT responses show the underlying protocol @@ -142,12 +141,13 @@ problems may have been fixed or changed somewhat since this was written. 15.7 generated .pc file contains strange entries 15.8 libcurl.pc uses absolute library paths 15.9 cert paths autodetected when cross-compiling - 15.10 libpsl is not supported + 15.10 libspsl is not supported 15.11 ExternalProject_Add does not set CURL_CA_PATH 15.12 cannot enable LDAPS on Windows 15.13 CMake build with MIT Kerberos does not work 16. Applications + 16.1 pulseUI VPN client 17. HTTP/2 17.1 Excessive HTTP/2 packets with TCP_NODELAY @@ -158,8 +158,13 @@ problems may have been fixed or changed somewhat since this was written. 18. HTTP/3 18.1 If the HTTP/3 server closes connection during upload curl hangs - 18.2 Transfer closed with n bytes remaining to read - 18.4 timeout when reusing a http3 connection + 18.2 Uploading HTTP/3 files gets interrupted at certain file sizes + 18.3 HTTP/3 download is 5x times slower than HTTP/2 + 18.4 Downloading with HTTP/3 produces broken files + 18.5 HTTP/3 download with quiche halts after a while + 18.6 HTTP/3 multipart POST with quiche fails + 18.7 HTTP/3 quiche upload large file fails + 18.8 HTTP/3 does not support client certs 18.9 connection migration does not work ============================================================================== @@ -189,12 +194,12 @@ problems may have been fixed or changed somewhat since this was written. something beyond ascii but currently libcurl will only pass in the verbatim string the app provides. There are several browsers that already do this encoding. The key seems to be the updated draft to RFC2231: - https://datatracker.ietf.org/doc/html/draft-reschke-rfc2231-in-http-02 + https://tools.ietf.org/html/draft-reschke-rfc2231-in-http-02 1.5 Expect-100 meets 417 If an upload using Expect: 100-continue receives an HTTP 417 response, it - ought to be automatically resent without the Expect:. A workaround is for + ought to be automatically resent without the Expect:. A workaround is for the client application to redo the transfer after disabling Expect:. https://curl.se/mail/archive-2008-02/0043.html @@ -206,7 +211,7 @@ problems may have been fixed or changed somewhat since this was written. 1.7 Deflate error after all content was received - There's a situation where we can get an error in an HTTP response that is + There's a situation where we can get an error in a HTTP response that is compressed, when that error is detected after all the actual body contents have been received and delivered to the application. This is tricky, but is ultimately a broken server. @@ -225,13 +230,14 @@ problems may have been fixed or changed somewhat since this was written. 1.11 CURLOPT_SEEKFUNCTION not called with CURLFORM_STREAM - When using libcurl to POST form data using a FILE* with the CURLFORM_STREAM - option of curl_formadd(). I notice that if the connection drops at just the - right time, the POST is reattempted without the data from the file. It seems - like the file stream position is not getting reset to the beginning of the - file. I found the CURLOPT_SEEKFUNCTION option and set that with a function - that performs an fseek() on the FILE*. However, setting that did not seem to - fix the issue or even get called. See https://github.com/curl/curl/issues/768 + I'm using libcurl to POST form data using a FILE* with the CURLFORM_STREAM + option of curl_formadd(). I have noticed that if the connection drops at just + the right time, the POST is reattempted without the data from the file. It + seems like the file stream position is not getting reset to the beginning of + the file. I found the CURLOPT_SEEKFUNCTION option and set that with a + function that performs an fseek() on the FILE*. However, setting that did not + seem to fix the issue or even get called. See + https://github.com/curl/curl/issues/768 2. TLS @@ -404,9 +410,9 @@ problems may have been fixed or changed somewhat since this was written. 4.2 -J with -C - fails When using -J (with -O), automatically resumed downloading together with "-C - -" fails. Without -J the same command line works. This happens because the + -" fails. Without -J the same command line works! This happens because the resume logic is worked out before the target file name (and thus its - pre-transfer size) has been figured out. + pre-transfer size) has been figured out! https://curl.se/bug/view.cgi?id=1169 4.3 --retry and transfer timeouts @@ -473,13 +479,6 @@ problems may have been fixed or changed somewhat since this was written. https://curl.se/bug/?i=731 https://curl.se/bug/?i=3747 -5.6 make distclean loops forever - - Due to an issue (probably) in automake, "make distclean" can end up in a - never-ending loop. - - See https://github.com/curl/curl/issues/7716 - 5.7 Visual Studio project gaps The Visual Studio projects lack some features that the autoconf and nmake @@ -504,7 +503,7 @@ problems may have been fixed or changed somewhat since this was written. This can make subsequent checks for libraries wrongly detect another installation in a directory that was previously added to LDFLAGS by another - library check. + library check! A possibly better way to do these checks would be to keep the pristine LDFLAGS even after successful checks and instead add those verified paths to a @@ -515,9 +514,11 @@ problems may have been fixed or changed somewhat since this was written. https://github.com/curl/curl/issues/864 -5.10 curl hangs on SMB upload over stdin +5.10 SMB tests fail with Python 2 - See https://github.com/curl/curl/issues/7896 + The error message says "TreeConnectAndX not found". + + See https://github.com/curl/curl/issues/5983 5.11 configure --with-gssapi with Heimdal is ignored on macOS @@ -563,7 +564,7 @@ problems may have been fixed or changed somewhat since this was written. 6.4 Negotiate and Kerberos V5 need a fake user name In order to get Negotiate (SPNEGO) authentication to work in HTTP or Kerberos - V5 in the email protocols, you need to provide a (fake) user name (this + V5 in the e-mail protocols, you need to provide a (fake) user name (this concerns both curl and the lib) because the code wrongly only considers authentication if there's a user name provided by setting conn->bits.user_passwd in url.c https://curl.se/bug/view.cgi?id=440 How? @@ -619,7 +620,7 @@ problems may have been fixed or changed somewhat since this was written. 6.11 Negotiate on Windows fails - When using --negotiate (or NTLM) with curl on Windows, SSL/TLS handshake + When using --negotiate (or NTLM) with curl on Windows, SSL/TSL handshake fails despite having a valid kerberos ticket cached. Works without any issue in Unix/Linux. @@ -633,7 +634,7 @@ problems may have been fixed or changed somewhat since this was written. 7.1 FTP without or slow 220 response - If a connection is made to an FTP server but the server then just never sends + If a connection is made to a FTP server but the server then just never sends the 220 response or otherwise is dead slow, libcurl will not acknowledge the connection timeout during that phase but only the "real" timeout - which may surprise users as it is probably considered to be the connect phase to most @@ -669,7 +670,7 @@ problems may have been fixed or changed somewhat since this was written. The sender converts the data from an internal character representation to the standard 8-bit NVT-ASCII representation (see the Telnet - specification). The receiver will convert the data from the standard + specification). The receiver will convert the data from the standard form to his own internal form. Since 7.15.4 at least line endings are converted. @@ -677,19 +678,19 @@ problems may have been fixed or changed somewhat since this was written. 7.6 FTP with NULs in URL parts FTP URLs passed to curl may contain NUL (0x00) in the RFC 1738 , - , and components, encoded as "%00". The problem is that + , and components, encoded as "%00". The problem is that curl_unescape does not detect this, but instead returns a shortened C string. From a strict FTP protocol standpoint, NUL is a valid character within RFC 959 , so the way to handle this correctly in curl would be to use a data structure other than a plain C string, one that can handle embedded NUL - characters. From a practical standpoint, most FTP servers would not + characters. From a practical standpoint, most FTP servers would not meaningfully support NUL characters within RFC 959 , anyway (e.g., Unix pathnames may not contain NUL). 7.7 FTP and empty path parts in the URL libcurl ignores empty path parts in FTP URLs, whereas RFC1738 states that - such parts should be sent to the server as 'CWD ' (without an argument). The + such parts should be sent to the server as 'CWD ' (without an argument). The only exception to this rule, is that we knowingly break this if the empty part is first in the path, as then we use the double slashes to indicate that the user wants to reach the root dir (this exception SHALL remain even when @@ -778,7 +779,7 @@ problems may have been fixed or changed somewhat since this was written. 9.3 Remote recursive folder creation with SFTP On this servers, the curl fails to create directories on the remote server - even when the CURLOPT_FTP_CREATE_MISSING_DIRS option is set. + even when CURLOPT_FTP_CREATE_MISSING_DIRS option is set. See https://github.com/curl/curl/issues/5204 @@ -800,7 +801,7 @@ problems may have been fixed or changed somewhat since this was written. Curl sends DNS requests for hostnames with a .onion TLD. This leaks information about what the user is attempting to access, and violates this - requirement of RFC7686: https://datatracker.ietf.org/doc/html/rfc7686 + requirement of RFC7686: https://tools.ietf.org/html/rfc7686 Issue: https://github.com/curl/curl/issues/543 @@ -817,11 +818,11 @@ problems may have been fixed or changed somewhat since this was written. to potentially transcend the life-time of the initial easy handle that was used to drive the transfer over that connection, it uses a *separate* and internal easy handle when it shuts down the connection. That separate - connection might not have the same settings as the original easy handle, and - in particular it is often note-worthy that it does not have the same VERBOSE - and debug callbacks setup so that an application will not get the protocol - data for the disconnect phase of a transfer the same way it got all the other - data. + connection might not have the exact same settings as the original easy + handle, and in particular it is often note-worthy that it does not have the + same VERBOSE and debug callbacks setup so that an application will not get + the protocol data for the disconnect phase of a transfer the same way it got + all the other data. This is because the original easy handle might have already been freed at that point and the application might not at all be prepared that the callback @@ -844,6 +845,20 @@ problems may have been fixed or changed somewhat since this was written. See https://github.com/curl/curl/issues/1332 and https://github.com/curl/curl/issues/4296 +11.6 slow connect to localhost on Windows + + When connecting to "localhost" on Windows, curl will resolve the name for + both ipv4 and ipv6 and try to connect to both happy eyeballs-style. Something + in there does however make it take 200 milliseconds to succeed - which is the + HAPPY_EYEBALLS_TIMEOUT define exactly. Lowering that define speeds up the + connection, suggesting a problem in the HE handling. + + If we can *know* that we are talking to a local host, we should lower the + happy eyeballs delay timeout for IPv6 (related: hardcode the "localhost" + addresses, mentioned in TODO). Possibly we should reduce that delay for all. + + https://github.com/curl/curl/issues/2281 + 11.7 signal-based resolver timeouts libcurl built without an asynchronous resolver library uses alarm() to time @@ -918,7 +933,7 @@ problems may have been fixed or changed somewhat since this was written. When libcurl creates sockets with socketpair(), those are not "exposed" in CURLOPT_OPENSOCKETFUNCTION and therefore might surprise and be unknown to - applications that expect and want all sockets known beforehand. One way to + applications that expects and wants all sockets known beforehand. One way to address this issue is to introduce a CURLOPT_OPENSOCKETPAIRFUNCTION callback. https://github.com/curl/curl/issues/5747 @@ -978,14 +993,6 @@ problems may have been fixed or changed somewhat since this was written. https://github.com/curl/curl/issues/686 -13.2 Trying local ports fails on Windows - - This makes '--local-port [range]' to not work since curl can't properly - detect if a port is already in use, so it'll try the first port, use that and - then subsequently fail anyway if that was actually in use. - - https://github.com/curl/curl/issues/8112 - 14. DICT 14.1 DICT responses show the underlying protocol @@ -1048,7 +1055,7 @@ problems may have been fixed or changed somewhat since this was written. See https://github.com/curl/curl/issues/6178 -15.10 libpsl is not supported +15.10 libspsl is not supported See https://github.com/curl/curl/issues/6214 @@ -1066,7 +1073,7 @@ problems may have been fixed or changed somewhat since this was written. 15.13 CMake build with MIT Kerberos does not work Minimum CMake version was bumped in curl 7.71.0 (#5358) Since CMake 3.2 - try_compile started respecting the CMAKE_EXE_FLAGS. The code dealing with + try_compile started respecting the CMAKE_EXE_FLAGS. The code dealing with MIT Kerberos detection sets few variables to potentially weird mix of space, and ;-separated flags. It had to blow up at some point. All the CMake checks that involve compilation are doomed from that point, the configured tree @@ -1076,6 +1083,19 @@ problems may have been fixed or changed somewhat since this was written. 16. Applications +16.1 pulseUI VPN client + + This application crashes at startup with libcurl 7.74.0 (and presumably later + versions too) after we cleaned up OpenSSL initialization. Since this is the + only known application to do this, we suspect it is related to something they + are doing in their setup that is not kosher. We have not been able to get in + contact with them nor got any technical details to help us debug this + further. + + See + https://community.pulsesecure.net/t5/Pulse-Desktop-Clients/Linux-Pulse-Client-does-not-work-with-curl-7-74/m-p/44378 + and https://github.com/curl/curl/issues/6306 + 17. HTTP/2 17.1 Excessive HTTP/2 packets with TCP_NODELAY @@ -1119,18 +1139,35 @@ problems may have been fixed or changed somewhat since this was written. See https://github.com/curl/curl/issues/6606 -18.2 Transfer closed with n bytes remaining to read +18.2 Uploading HTTP/3 files gets interrupted at certain file sizes + + See https://github.com/curl/curl/issues/6510 + +18.3 HTTP/3 download is 5x times slower than HTTP/2 + + See https://github.com/curl/curl/issues/6494 + +18.4 Downloading with HTTP/3 produces broken files + + See https://github.com/curl/curl/issues/7351 + +18.5 HTTP/3 download with quiche halts after a while + + See https://github.com/curl/curl/issues/7339 + +18.6 HTTP/3 multipart POST with quiche fails + + https://github.com/curl/curl/issues/7125 - HTTP/3 transfers with the Jetty HTTP/3 server seem to not work. +18.7 HTTP/3 quiche upload large file fails - https://github.com/curl/curl/issues/8523 + https://github.com/curl/curl/issues/7532 -18.4 timeout when reusing a http3 connection +18.8 HTTP/3 does not support client certs - HTTP/3 with quiche seems to not work and always timeout a subsequent transfer - that reuses an already established connection + aka "mutual authentication". - https://github.com/curl/curl/issues/8764 + https://github.com/curl/curl/issues/7625 18.9 connection migration does not work diff --git a/3rdparty/curl-7.84.0/docs/MAIL-ETIQUETTE b/3rdparty/curl-7.80.0/docs/MAIL-ETIQUETTE similarity index 93% rename from 3rdparty/curl-7.84.0/docs/MAIL-ETIQUETTE rename to 3rdparty/curl-7.80.0/docs/MAIL-ETIQUETTE index 8d5f10a4..2d54e0a4 100644 --- a/3rdparty/curl-7.84.0/docs/MAIL-ETIQUETTE +++ b/3rdparty/curl-7.80.0/docs/MAIL-ETIQUETTE @@ -25,7 +25,7 @@ MAIL ETIQUETTE 2.5 HTML is not for mails 2.6 Quoting 2.7 Digest - 2.8 Please Tell Us How You Solved The Problem + 2.8 Please Tell Us How You Solved The Problem! ============================================================================== @@ -40,12 +40,12 @@ MAIL ETIQUETTE please use the one or the ones that suit you the most. Each mailing list has hundreds up to thousands of readers, meaning that each - mail sent will be received and read by a large number of people. People + mail sent will be received and read by a large number of people. People from various cultures, regions, religions and continents. 1.2 Netiquette - Netiquette is a common term for how to behave on the Internet. Of course, in + Netiquette is a common term for how to behave on the internet. Of course, in each particular group and subculture there will be differences in what is acceptable and what is considered good manners. @@ -111,7 +111,7 @@ MAIL ETIQUETTE anything good and only puts the light even more on the offender: which was the entire purpose of it getting sent to the list in the first place. - Do not feed the trolls. + Do not feed the trolls! 1.7 How to unsubscribe @@ -129,8 +129,8 @@ MAIL ETIQUETTE 1.8 I posted, now what? - If you are not subscribed with the same email address that you used to send - the email, your post will just be silently discarded. + If you are not subscribed with the exact same email address that you used to + send the email, your post will just be silently discarded. If you posted for the first time to the mailing list, you first need to wait for an administrator to allow your email to go through (moderated). This @@ -138,18 +138,18 @@ MAIL ETIQUETTE few hours. Once your email goes through it is sent out to several hundred or even - thousands of recipients. Your email may cover an area that not that many + thousands of recipients. Your email may cover an area that not that many people know about or are interested in. Or possibly the person who knows about it is on vacation or under a heavy work load right now. You may have - to wait for a response and you should not expect to get a response at all. - Ideally, you get an answer within a couple of days. + to wait for a response and you should not expect to get a response at all, + but hopefully you get an answer within a couple of days. You do yourself and all of us a service when you include as many details as possible already in your first email. Mention your operating system and environment. Tell us which curl version you are using and tell us what you did, what happened and what you expected would happen. Preferably, show us - what you did with details enough to allow others to help point out the - problem or repeat the steps in their locations. + what you did with details enough to allow others to help point out the problem + or repeat the same steps in their locations. Failing to include details will only delay responses and make people respond and ask for more details and you will have to send a follow-up email that @@ -195,7 +195,7 @@ MAIL ETIQUETTE Many mail programs and web archivers use information within mails to keep them together as "threads", as collections of posts that discuss a certain subject. If you do not intend to reply on the same or similar subject, do not - just hit reply on an existing mail and change the subject, create a new mail. + just hit reply on an existing mail and change subject, create a new mail. 2.2 Reply to the List @@ -225,7 +225,7 @@ MAIL ETIQUETTE A: Because it messes up the order in which people normally read text. Q: Why is top-posting such a bad thing? A: Top-posting. - Q: What is the most annoying thing in email? + Q: What is the most annoying thing in e-mail? Apart from the screwed up read order (especially when mixed together in a thread when someone responds using the mandated bottom-posting style), it @@ -239,7 +239,7 @@ MAIL ETIQUETTE downwards again. When most of the quotes have been removed and you have added your own words, - you are done. + you are done! 2.5 HTML is not for mails @@ -268,7 +268,7 @@ MAIL ETIQUETTE Change the subject name to something sensible and related to the subject, preferably even the actual subject of the single mail you wanted to reply to - 2.8 Please Tell Us How You Solved The Problem + 2.8 Please Tell Us How You Solved The Problem! Many people mail questions to the list, people spend some of their time and make an effort in providing good answers to these questions. @@ -278,8 +278,8 @@ MAIL ETIQUETTE feel good to know that they provided a good answer and that you fixed the problem. Far too often, the person who asked the question is never heard from again, and we never get to know if he/she is gone because the problem was - solved or perhaps because the problem was unsolvable. + solved or perhaps because the problem was unsolvable! Getting the solution posted also helps other users that experience the same problem(s). They get to see (possibly in the web archives) that the - suggested fixes actually have helped at least one person. + suggested fixes actually has helped at least one person. diff --git a/3rdparty/curl-7.84.0/docs/MQTT.md b/3rdparty/curl-7.80.0/docs/MQTT.md similarity index 100% rename from 3rdparty/curl-7.84.0/docs/MQTT.md rename to 3rdparty/curl-7.80.0/docs/MQTT.md diff --git a/3rdparty/curl-7.84.0/docs/Makefile.am b/3rdparty/curl-7.80.0/docs/Makefile.am similarity index 97% rename from 3rdparty/curl-7.84.0/docs/Makefile.am rename to 3rdparty/curl-7.80.0/docs/Makefile.am index 0959ac59..5d5888cc 100644 --- a/3rdparty/curl-7.84.0/docs/Makefile.am +++ b/3rdparty/curl-7.80.0/docs/Makefile.am @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2021, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,8 +18,6 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # -# SPDX-License-Identifier: curl -# ########################################################################### AUTOMAKE_OPTIONS = foreign no-dependencies @@ -59,6 +57,7 @@ EXTRA_DIST = \ CURL-DISABLE.md \ DEPRECATE.md \ DYNBUF.md \ + ECH.md \ EXPERIMENTAL.md \ FAQ \ FEATURES.md \ diff --git a/3rdparty/curl-7.84.0/docs/Makefile.in b/3rdparty/curl-7.80.0/docs/Makefile.in similarity index 99% rename from 3rdparty/curl-7.84.0/docs/Makefile.in rename to 3rdparty/curl-7.80.0/docs/Makefile.in index d0a78dd9..78a33dda 100644 --- a/3rdparty/curl-7.84.0/docs/Makefile.in +++ b/3rdparty/curl-7.80.0/docs/Makefile.in @@ -21,7 +21,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2021, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -34,8 +34,6 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # -# SPDX-License-Identifier: curl -# ########################################################################### VPATH = @srcdir@ am__is_gnu_make = { \ @@ -120,7 +118,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compile_check_sizeof.m4 \ $(top_srcdir)/m4/curl-confopts.m4 \ $(top_srcdir)/m4/curl-functions.m4 \ $(top_srcdir)/m4/curl-gnutls.m4 \ - $(top_srcdir)/m4/curl-mbedtls.m4 $(top_srcdir)/m4/curl-nss.m4 \ + $(top_srcdir)/m4/curl-mbedtls.m4 \ + $(top_srcdir)/m4/curl-mesalink.m4 $(top_srcdir)/m4/curl-nss.m4 \ $(top_srcdir)/m4/curl-openssl.m4 \ $(top_srcdir)/m4/curl-override.m4 \ $(top_srcdir)/m4/curl-reentrant.m4 \ @@ -302,7 +301,6 @@ CURL_DISABLE_TFTP = @CURL_DISABLE_TFTP@ CURL_LT_SHLIB_VERSIONED_FLAVOUR = @CURL_LT_SHLIB_VERSIONED_FLAVOUR@ CURL_NETWORK_AND_TIME_LIBS = @CURL_NETWORK_AND_TIME_LIBS@ CURL_NETWORK_LIBS = @CURL_NETWORK_LIBS@ -CURL_PLIST_VERSION = @CURL_PLIST_VERSION@ CURL_WITH_MULTI_SSL = @CURL_WITH_MULTI_SSL@ CYGPATH_W = @CYGPATH_W@ DEFAULT_SSL_BACKEND = @DEFAULT_SSL_BACKEND@ @@ -320,7 +318,6 @@ ENABLE_STATIC = @ENABLE_STATIC@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ -FILECMD = @FILECMD@ FISH_FUNCTIONS_DIR = @FISH_FUNCTIONS_DIR@ GCOV = @GCOV@ GREP = @GREP@ @@ -396,7 +393,7 @@ USE_LIBRTMP = @USE_LIBRTMP@ USE_LIBSSH = @USE_LIBSSH@ USE_LIBSSH2 = @USE_LIBSSH2@ USE_MBEDTLS = @USE_MBEDTLS@ -USE_MSH3 = @USE_MSH3@ +USE_MESALINK = @USE_MESALINK@ USE_NGHTTP2 = @USE_NGHTTP2@ USE_NGHTTP3 = @USE_NGHTTP3@ USE_NGTCP2 = @USE_NGTCP2@ @@ -468,6 +465,7 @@ runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ +subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ @@ -507,6 +505,7 @@ EXTRA_DIST = \ CURL-DISABLE.md \ DEPRECATE.md \ DYNBUF.md \ + ECH.md \ EXPERIMENTAL.md \ FAQ \ FEATURES.md \ diff --git a/3rdparty/curl-7.84.0/docs/NEW-PROTOCOL.md b/3rdparty/curl-7.80.0/docs/NEW-PROTOCOL.md similarity index 94% rename from 3rdparty/curl-7.84.0/docs/NEW-PROTOCOL.md rename to 3rdparty/curl-7.80.0/docs/NEW-PROTOCOL.md index 9a145181..2a9af6f3 100644 --- a/3rdparty/curl-7.84.0/docs/NEW-PROTOCOL.md +++ b/3rdparty/curl-7.80.0/docs/NEW-PROTOCOL.md @@ -5,7 +5,7 @@ another protocol to curl. After all, curl already supports 25 something protocols and it is the Internet transfer machine for the world. In the curl project we love protocols and we love supporting many protocols -and doing it well. +and do it well. So how do you proceed to add a new protocol and what are the requirements? @@ -23,7 +23,7 @@ that supporting this protocol is a grand idea. curl is not here for your protocol. Your protocol is not here for curl. The best cooperation and end result occur when all involved parties mutually see and agree that supporting this protocol in curl would be good for everyone. -Heck, for the world. +Heck, for the world! Consider "selling us" the idea that we need an implementation merged in curl, to be fairly important. *Why* do we want curl to support this new protocol? @@ -90,8 +90,8 @@ protocol - but it might require a bit of an effort to make it happen. ## Documentation -We cannot assume that users are particularly familiar with details and -peculiarities of the protocol. It needs documentation. +We cannot assume that users are particularly familiar with specific details +and peculiarities of the protocol. It needs documentation. Maybe it even needs some internal documentation so that the developers who will try to debug something five years from now can figure out functionality a @@ -104,7 +104,7 @@ any NDA or similar. We are constantly raising the bar and we are constantly improving the project. A lot of things we did in the past would not be acceptable if done -today. Therefore, you might be tempted to use shortcuts or "hacks" you can +today. Therefore, you might be tempted to use shortcuts or "hacks" you can spot other - existing - protocol implementations have used, but there is nothing to gain from that. The bar has been raised. Former "cheats" will not be tolerated anymore. diff --git a/3rdparty/curl-7.84.0/docs/PARALLEL-TRANSFERS.md b/3rdparty/curl-7.80.0/docs/PARALLEL-TRANSFERS.md similarity index 99% rename from 3rdparty/curl-7.84.0/docs/PARALLEL-TRANSFERS.md rename to 3rdparty/curl-7.80.0/docs/PARALLEL-TRANSFERS.md index 325e64f9..6282fe51 100644 --- a/3rdparty/curl-7.84.0/docs/PARALLEL-TRANSFERS.md +++ b/3rdparty/curl-7.80.0/docs/PARALLEL-TRANSFERS.md @@ -49,7 +49,7 @@ share API as well, as a context per origin + path (realm?) basically. Visible in test 153, 1412 and more. -## Feedback +## Feedback! This is early days for parallel transfer support. Keep your eyes open for unintended side effects or downright bugs. diff --git a/3rdparty/curl-7.84.0/docs/README.md b/3rdparty/curl-7.80.0/docs/README.md similarity index 100% rename from 3rdparty/curl-7.84.0/docs/README.md rename to 3rdparty/curl-7.80.0/docs/README.md diff --git a/3rdparty/curl-7.84.0/docs/RELEASE-PROCEDURE.md b/3rdparty/curl-7.80.0/docs/RELEASE-PROCEDURE.md similarity index 87% rename from 3rdparty/curl-7.84.0/docs/RELEASE-PROCEDURE.md rename to 3rdparty/curl-7.80.0/docs/RELEASE-PROCEDURE.md index 65c02f91..26d5dedb 100644 --- a/3rdparty/curl-7.84.0/docs/RELEASE-PROCEDURE.md +++ b/3rdparty/curl-7.80.0/docs/RELEASE-PROCEDURE.md @@ -95,12 +95,18 @@ Coming dates Based on the description above, here are some planned release dates (at the time of this writing): -- May 11, 2022 (7.83.1) -- July 1, 2022 -- August 31, 2022 -- October 25, 2022 -- December 21, 2022 -- February 15, 2023 (last version 7 release, no feature window after) -- March 20, 2023 (8.0.0 - curl 25 years) -- April 17, 2023 -- July 12, 2023 +- September 15, 2021 (7.79.0) +- November 10, 2021 +- January 5, 2022 +- March 2, 2022 +- April 27, 2022 +- June 22, 2022 +- August 17, 2022 +- October 12, 2022 +- December 7, 2022 +- February 1, 2023 +- March 20, 2023 (8.0.0) + +The above (and more) curl-related dates are published in +[iCalendar format](https://calendar.google.com/calendar/ical/c9u5d64odop9js55oltfarjk6g%40group.calendar.google.com/public/basic.ics) +as well. diff --git a/3rdparty/curl-7.84.0/docs/ROADMAP.md b/3rdparty/curl-7.80.0/docs/ROADMAP.md similarity index 91% rename from 3rdparty/curl-7.84.0/docs/ROADMAP.md rename to 3rdparty/curl-7.80.0/docs/ROADMAP.md index e48c21b5..79e8b03a 100644 --- a/3rdparty/curl-7.84.0/docs/ROADMAP.md +++ b/3rdparty/curl-7.80.0/docs/ROADMAP.md @@ -14,7 +14,7 @@ eventually remove the "experimental" label from this functionality. As a DNS version of alt-svc and also a pre-requisite for ECH (see below). -See: https://datatracker.ietf.org/doc/html/draft-ietf-dnsop-svcb-https-02 +See: https://tools.ietf.org/html/draft-ietf-dnsop-svcb-https-02 ## ECH (Encrypted Client Hello - formerly known as ESNI) diff --git a/3rdparty/curl-7.84.0/docs/RUSTLS.md b/3rdparty/curl-7.80.0/docs/RUSTLS.md similarity index 82% rename from 3rdparty/curl-7.84.0/docs/RUSTLS.md rename to 3rdparty/curl-7.80.0/docs/RUSTLS.md index 4b49b5cf..ecce4300 100644 --- a/3rdparty/curl-7.84.0/docs/RUSTLS.md +++ b/3rdparty/curl-7.80.0/docs/RUSTLS.md @@ -3,7 +3,7 @@ [Rustls is a TLS backend written in Rust.](https://docs.rs/rustls/). Curl can be built to use it as an alternative to OpenSSL or other TLS backends. We use the [rustls-ffi C bindings](https://github.com/rustls/rustls-ffi/). This -version of curl depends on version v0.8.2 of rustls-ffi. +version of curl depends on version v0.7.0 of rustls-ffi. # Building with rustls @@ -12,7 +12,7 @@ First, [install Rust](https://rustup.rs/). Next, check out, build, and install the appropriate version of rustls-ffi: % cargo install cbindgen - % git clone https://github.com/rustls/rustls-ffi -b v0.8.2 + % git clone https://github.com/rustls/rustls-ffi -b v0.7.0 % cd rustls-ffi % make % make DESTDIR=${HOME}/rustls-ffi-built/ install @@ -21,6 +21,6 @@ Now configure and build curl with rustls: % git clone https://github.com/curl/curl % cd curl - % autoreconf -fi + % ./buildconf % ./configure --with-rustls=${HOME}/rustls-ffi-built % make diff --git a/3rdparty/curl-7.84.0/docs/SECURITY-PROCESS.md b/3rdparty/curl-7.80.0/docs/SECURITY-PROCESS.md similarity index 58% rename from 3rdparty/curl-7.84.0/docs/SECURITY-PROCESS.md rename to 3rdparty/curl-7.80.0/docs/SECURITY-PROCESS.md index a7e86615..f13d6d3a 100644 --- a/3rdparty/curl-7.84.0/docs/SECURITY-PROCESS.md +++ b/3rdparty/curl-7.80.0/docs/SECURITY-PROCESS.md @@ -1,9 +1,11 @@ -# curl security process +curl security process +===================== This document describes how security vulnerabilities should be handled in the curl project. -## Publishing Information +Publishing Information +---------------------- All known and public curl or libcurl related vulnerabilities are listed on [the curl website security page](https://curl.se/docs/security.html). @@ -11,12 +13,13 @@ All known and public curl or libcurl related vulnerabilities are listed on Security vulnerabilities **should not** be entered in the project's public bug tracker. -## Vulnerability Handling +Vulnerability Handling +---------------------- The typical process for handling a new security vulnerability is as follows. No information should be made public about a vulnerability until it is -formally announced at the end of this process. That means, for example, that a +formally announced at the end of this process. That means, for example that a bug tracker entry must NOT be created to track the issue since that will make the issue public and it should not be discussed on any of the project's public mailing lists. Also messages associated with any commits should not make any @@ -35,8 +38,7 @@ announcement. that a human has seen the report. - The security team investigates the report and either rejects it or accepts - it. See below for examples of problems that are not considered - vulnerabilities. + it. - If the report is rejected, the team writes to the reporter to explain why. @@ -66,7 +68,7 @@ announcement. should ideally contain the CVE number. - The security team also decides on and delivers a monetary reward to the - reporter as per the bug-bounty policies. + reporter as per the bug-bounty polices. - No more than 10 days before release, inform [distros@openwall](https://oss-security.openwall.org/wiki/mailing-lists/distros) @@ -90,7 +92,8 @@ announcement. - The security web page on the website should get the new vulnerability mentioned. -## security (at curl dot se) +security (at curl dot se) +------------------------------ This is a private mailing list for discussions on and about curl security issues. @@ -100,12 +103,13 @@ might ask you to join the list or you can ask to join it. It really is not a formal process. We basically only require that you have a long-term presence in the curl project and you have shown an understanding for the project and its way of working. You must have been around for a good while and you should -have no plans of vanishing in the near future. +have no plans in vanishing in the near future. We do not make the list of participants public mostly because it tends to vary somewhat over time and a list somewhere will only risk getting outdated. -## Publishing Security Advisories +Publishing Security Advisories +------------------------------ 1. Write up the security advisory, using markdown syntax. Use the same subtitles as last time to maintain consistency. @@ -115,100 +119,23 @@ somewhat over time and a list somewhere will only risk getting outdated. 3. Add a line on the top of the array in `curl-www/docs/vuln.pm'. 4. Put the new advisory markdown file in the curl-www/docs/ directory. Add it - to the git repository. + to the git repo. 5. Run `make` in your local web checkout and verify that things look fine. 6. On security advisory release day, push the changes on the curl-www repository's remote master branch. -## Hackerone +Hackerone +--------- Request the issue to be disclosed. If there are sensitive details present in the report and discussion, those should be redacted from the disclosure. The default policy is to disclose as much as possible as soon as the vulnerability has been published. -## Bug Bounty +Bug Bounty +---------- See [BUG-BOUNTY](https://curl.se/docs/bugbounty.html) for details on the bug bounty program. - -# Not security issues - -This is an incomplete list of issues that are not considered vulnerabilities. - -## Small memory leaks - -We do not consider a small memory leak a security problem; even if the amount -of allocated memory grows by a small amount every now and then. Long-living -applications and services already need to have counter-measures and deal with -growing memory usage, be it leaks or just increased use. A small memory or -resource leak is then expected to *not* cause a security problem. - -Of course there can be a discussion if a leak is small or not. A large leak -can be considered a security problem due to the DOS risk. If leaked memory -contains sensitive data it might also qualify as a security problem. - -## Never-ending transfers - -We do not consider flaws that cause a transfer to never end to be a security -problem. There are already several benign and likely reasons for transfers to -stall and never end, so applications that cannot deal with never-ending -transfers already need to have counter-measures established. - -If the problem avoids the regular counter-measures when it causes a never- -ending transfer, it might very well be a security problem. - -## Not practically possible - -If the flaw or vulnerability cannot practically get executed on existing -hardware it is not a security problem. - -## API misuse - -If a reported issue only triggers by an application using the API in a way -that is not documented to work or even documented to not work, it is probably -not going to be considered a security problem. We only guarantee secure and -proper functionality when the APIs are used as expected and documented. - -There can be a discussion about what the documentation actually means and how -to interpret the text, which might end up with us still agreeing that it is a -security problem. - -## Local attackers already present - -When an issue can only be attacked or misused by an attacker present on the -local system or network, the bar is raised. If a local user wrongfully has -elevated rights on your system enough to attack curl, they can probably -already do much worse harm and the problem is not really in curl. - -## Experiments - -Vulnerabilities in features which are off by default (in the build) and -documented as experimental, are not eligible for a reward and we do not -consider them security problems. - -## URL inconsistencies - -URL parser inconsistencies between browsers and curl are expected and are not -considered security vulnerabilities. The WHATWG URL Specification and RFC -3986+ (the plus meaning that it is an extended version) [are not completely -interoperable](https://github.com/bagder/docs/blob/master/URL-interop.md). - -Obvious parser bugs can still be vulnerabilities of course. - -## Visible command line arguments - -The curl command blanks the contents of a number of command line arguments to -prevent them from appearing in process listings. It does not blank all -arguments even if some of them that are not blanked might contain sensitive -data. We consider this functionality a best-effort and omissions are not -security vulnerabilities. - - - not all systems allow the arguments to be blanked in the first place - - since curl blanks the argument itself they will be readable for a short - moment in time no matter what - - virtually every argument can contain sensitive data, depending on use - - blanking all arguments would make it impractical for users to differentiate - curl command lines in process listings diff --git a/3rdparty/curl-7.84.0/docs/SSL-PROBLEMS.md b/3rdparty/curl-7.80.0/docs/SSL-PROBLEMS.md similarity index 96% rename from 3rdparty/curl-7.84.0/docs/SSL-PROBLEMS.md rename to 3rdparty/curl-7.80.0/docs/SSL-PROBLEMS.md index 4afe3001..3ba601aa 100644 --- a/3rdparty/curl-7.84.0/docs/SSL-PROBLEMS.md +++ b/3rdparty/curl-7.80.0/docs/SSL-PROBLEMS.md @@ -11,7 +11,7 @@ ago. There are several known reasons why a connection that involves SSL might - fail. This is a document that attempts to detail the most common ones and + fail. This is a document that attempts to details the most common ones and how to mitigate them. ## CA certs @@ -70,7 +70,7 @@ References: - https://datatracker.ietf.org/doc/html/draft-popov-tls-prohibiting-rc4-01 + https://tools.ietf.org/html/draft-popov-tls-prohibiting-rc4-01 ## Allow BEAST diff --git a/3rdparty/curl-7.84.0/docs/SSLCERTS.md b/3rdparty/curl-7.80.0/docs/SSLCERTS.md similarity index 96% rename from 3rdparty/curl-7.84.0/docs/SSLCERTS.md rename to 3rdparty/curl-7.80.0/docs/SSLCERTS.md index ec57f41c..0aeab3b1 100644 --- a/3rdparty/curl-7.84.0/docs/SSLCERTS.md +++ b/3rdparty/curl-7.80.0/docs/SSLCERTS.md @@ -29,12 +29,12 @@ Which CAs do you trust? You can decide to trust the same set of companies your operating system trusts, or the set one of the known browsers trust. That is basically trust via someone else you trust. You should just be aware that modern operating systems and browsers are setup to trust *hundreds* of -companies and in recent years several such CAs have been found untrustworthy. +companies and recent years several such CAs have been found untrustworthy. Certificate Verification ------------------------ -libcurl performs peer SSL certificate verification by default. This is done +libcurl performs peer SSL certificate verification by default. This is done by using a CA certificate store that the SSL library can use to make sure the peer's server certificate is valid. @@ -63,8 +63,8 @@ server, do one of the following: store. The default CA certificate store can be changed at compile time with the following configure options: - --with-ca-bundle=FILE: use the specified file as the CA certificate store. - CA certificates need to be concatenated in PEM format into this file. + --with-ca-bundle=FILE: use the specified file as CA certificate store. CA + certificates need to be concatenated in PEM format into this file. --with-ca-path=PATH: use the specified path as CA certificate store. CA certificates need to be stored as individual PEM files in this directory. diff --git a/3rdparty/curl-7.84.0/docs/THANKS b/3rdparty/curl-7.80.0/docs/THANKS similarity index 95% rename from 3rdparty/curl-7.84.0/docs/THANKS rename to 3rdparty/curl-7.80.0/docs/THANKS index b9f6eee2..82755c72 100644 --- a/3rdparty/curl-7.84.0/docs/THANKS +++ b/3rdparty/curl-7.80.0/docs/THANKS @@ -6,7 +6,6 @@ 0xee on github 0xflotus on github -1337vt on github 1ocalhost on github 3dyd on github 3eka on github @@ -29,7 +28,6 @@ Adam Langley Adam Light Adam Marcionek Adam Piggott -Adam Rosenfield Adam Sampson Adam Tkac Adnan Khan @@ -173,7 +171,6 @@ Andrew Moise Andrew Potter Andrew Robbins Andrew Wansink -Andrey Alifanov Andrey Gursky Andrey Labunets Andrii Moiseiev @@ -185,7 +182,6 @@ Andy Serpa Andy Tsouladze Angus Mackay anio on github -anon00000000 on github anshnd on github Antarpreet Singh Anthon Pang @@ -197,7 +193,6 @@ Anthony Ramine Anthony Shaw Antoine Aubert Antoine Calando -Antoine Pietri Anton Bychkov Anton Gerasimov Anton Kalmykov @@ -233,7 +228,6 @@ Augustus Saunders Austin Green Avery Fay awesomenode on github -Axel Chong Axel Morawietz Axel Tillequin Ayoub Boudhar @@ -243,7 +237,6 @@ Bachue Zhou Balaji Parasuram Balaji S Rao Balaji Salunke -Balakrishnan Balasubramanian Balazs Kovacsics Balint Szilakszi Barry Abrahamson @@ -280,7 +273,6 @@ Benoit Neil Benoit Sigoure Bernard Leak Bernard Spil -Bernat Mut Bernd Mueller Bernhard Iselborn Bernhard M. Wiedemann @@ -318,7 +310,6 @@ bobmitchell1956 on github Bodo Bergmann Bogdan Nicula Boris Rasin -Boris Verkhovskiy Brad Burdick Brad Fitzpatrick Brad Harder @@ -350,7 +341,6 @@ Bru Rom Bruce Mitchener Bruce Stephens BrumBrum on hackerone -Bruno Baguette Bruno de Carvalho Bruno Grasselli Bruno Thomsen @@ -367,14 +357,12 @@ Calvin Buckley Cameron Cawley Cameron Kaiser Cameron MacMinn -Cameron Will Camille Moncelier Cao ZhenXiang Caolan McNamara Captain Basil Carie Pointer Carl Zogheib -Carlo Alberto Carlo Cannas Carlo Marcelo Arenas Belón Carlo Teubner @@ -389,7 +377,6 @@ cclauss on github Cesar Eduardo Barros Chad Monroe Chandrakant Bagul -Charles Cazabon Charles Kerr Charles Romestant Chen Prog @@ -429,7 +416,6 @@ Christophe Demory Christophe Dervieux Christophe Legry Christopher Conroy -Christopher Degawa Christopher Head Christopher Palow Christopher R. Palmer @@ -456,12 +442,10 @@ coinhubs on github Colby Ranger Colin Blair Colin Hogben -Colin Leroy Colin O'Dell Colin Watson Colm Buckley Constantine Sapuntzakis -coralw on github Cory Benfield Cory Nelson Costya Shulyupin @@ -494,7 +478,6 @@ Dambaev Alexander Damian Dixon Damien Adant Damien Vielpeau -Damien Walsh Dan Becker Dan Cristian Dan Donahue @@ -534,7 +517,6 @@ Daniel Silverstone Daniel Steinberg Daniel Stenberg Daniel Theron -Daniel Valenzuela Daniel Woelfel Daphne Luong Dario Nieuwenhuis @@ -555,7 +537,6 @@ David Bau David Benjamin David Binderman David Blaikie -David Bohman David Byron David Cohen David Cook @@ -593,7 +574,6 @@ David Walser David Woodhouse David Wright David Yan -Davide Cassioli davidedec on github dbrowndan on github dEajL3kA on github @@ -700,7 +680,6 @@ Edward Thomson Eelco Dolstra Eetu Ojanen Egon Eckert -Egor Pugin Ehren Bendler Eldar Zaitov elelel on github @@ -710,11 +689,9 @@ Elia Tufarolo Elliot Saba Ellis Pritchard Elmira A Semenova -Elms elsamuko on github emanruse on github Emanuele Bovisio -Emanuele Torre Emil Engler Emil Lerner Emil Romanus @@ -732,7 +709,6 @@ Eric Lavigne Eric Lubin Eric Melville Eric Mertens -Eric Musser Eric Rautman Eric Rescorla Eric Ridge @@ -772,12 +748,10 @@ Fabian Frank Fabian Hiernaux Fabian Keil Fabian Ruff -Fabian Yamaguchi Fabrice Fontaine Fabrizio Ammollo Fahim Chandurwala Faizur Rahman -Farzin on github Fawad Mirza fds242 on github Federico Bianchi @@ -791,21 +765,17 @@ Felix von Leitner Felix Yan Feng Tu Fernando Muñoz -Filip Lundgren Filip Salomonsson Firefox OS Flameborn on github Flavio Medeiros -Florian Kohnhäuser Florian Pritz Florian Schoppmann -Florian Van Heghe Florian Weimer Florin Petriuc Forrest Cahoon Francisco Moraes Francisco Munoz -Francisco Olarte Francisco Sedano Francois Petitjean Francois Rivard @@ -820,7 +790,6 @@ Frank Van Uffelen František Kučera François Charlier François Rigault -Frazer Smith Fred Machado Fred New Fred Noz @@ -836,9 +805,7 @@ Gabriel Simmer Gabriel Sjoberg Gambit Communications Ganesh Kamath -gaoxingwang on github Garrett Holmstrom -Garrett Squire Gary Maxwell Gaurav Malhotra Gautam Kachroo @@ -847,7 +814,6 @@ Gavin Wong Gavrie Philipson Gaz Iqbal Gaël Portay -gclinch on github Gealber Morales Geeknik Labs Geoff Beier @@ -883,7 +849,6 @@ Glen Nakamura Glen Scott Glenn de boer Glenn Sheridan -Glenn Strauss Godwin Stewart Google Inc. Gordon Marler @@ -936,7 +901,6 @@ Hao Wu Hardeep Singh Haris Okanovic Harold Stuart -Harry Sarson Harry Sintonen Harshal Pradhan Hauke Duden @@ -951,12 +915,10 @@ Helwing Lutz Hendrik Visage Henri Gomez Henrik Gaßmann -Henrik Holst Henrik Storner Henry Ludemann Henry Roeland Herve Amblard -HexTheDragon Hidemoto Nakada Himanshu Gupta Ho-chi Chen @@ -975,7 +937,6 @@ huzunhao on github hydra3333 on github Hzhijun iammrtau on github -Ian Blanes Ian D Allen Ian Fette Ian Ford @@ -997,11 +958,9 @@ Ikko Ashimine Ilguiz Latypov Ilja van Sprundel Illarion Taev -illusory-dream on github Ilya Kosarev imilli on github Immanuel Gregoire -ImpatientHippo on GitHub Inca R infinnovation-dev on github Ingmar Runge @@ -1033,7 +992,6 @@ Jactry Zeng Jad Chamcham Jaime Fullaondo jakirkham on github -Jakub Bochenski Jakub Wilk Jakub Zakrzewski James Atwill @@ -1063,9 +1021,7 @@ Jan Mazur Jan Schaumann Jan Schmidt Jan Van Boghout -Jan Venekamp Jan Verbeek -Jan-Piet Mens JanB on github Janne Johansson Jared Jennings @@ -1086,7 +1042,6 @@ Javier G. Sogo Javier Navarro Javier Sixto Jay Austin -Jay Dommaschk Jayesh A Shah Jaz Fresh Jean Fabrice @@ -1105,15 +1060,12 @@ Jeff Hodges Jeff Johnson Jeff King Jeff Lawson -Jeff Luszcz Jeff Mears Jeff Phillips Jeff Pohlmeyer Jeff Weber Jeffrey Tolar Jeffrey Walton -jeffrson on github -Jenny Heino Jens Finkhaeuser Jens Rantil Jens Schleusener @@ -1141,9 +1093,7 @@ Jesse Chisholm Jesse Noller Jesse Tan jethrogb on github -jhoyla on github Jie He -Jim Beveridge Jim Drash Jim Freeman Jim Fuller @@ -1189,7 +1139,6 @@ John Dennis John Dunn John E. Malmberg John Gardiner Myers -John H. Ayad John Hascall John Janssen John Joseph Bachir @@ -1238,7 +1187,6 @@ Jonathan Nieder Jonathan Watt Jonathan Wernberg Jongki Suwandi -jonny112 on github Joombalaya on github Joonas Kuorilehto Jordan Brown @@ -1257,6 +1205,7 @@ Josip Medved Josue Andrade Gomes José Joaquín Atria Jozef Kralik +JP Mens Juan Barreto Juan F. Codagnone Juan Ignacio Hervás @@ -1274,13 +1223,11 @@ Julian Z Julien Chaffraix Julien Nabet Julien Royer -Jun Tseng Jun-ichiro itojun Hagino Jun-ya Kato jungle-boogie on github Junho Choi Jurij Smakov -jurisuk on github Juro Bystricky Justin Clift Justin Ehlert @@ -1306,11 +1253,9 @@ Kamil Dudka Kane York Kang Lin Kang-Jin Lee -Kantanat Wannapaka Kari Pahula Karl Chen Karl Moerder -Karlson2k on github Karol Pietrzak Kartik Mahajan Kaspar Brand @@ -1330,7 +1275,6 @@ Kenny To Kent Boortz Kerem Kat Keshav Krity -Kevin Adler Kevin Baughman Kevin Burke Kevin Fisk @@ -1358,7 +1302,6 @@ Koichi Shiraishi kokke on github Konstantin Isakov Konstantin Kushnir -KotlinIsland on github kotoriのねこ kouzhudong on github Kovalkov Dmitrii @@ -1374,7 +1317,6 @@ Kristoffer Gleditsch Kunal Chandarana Kunal Ekawde Kurt Fankhauser -Kushal Das Kwon-Young Choi Kyle Abramowitz Kyle Edwards @@ -1407,8 +1349,6 @@ Laurie Clark-Michalek Lawrence Gripper Lawrence Matthews Lawrence Wagerfield -Leah Neukirchen -Leandro Coutinho Legoff Vincent Lehel Bernadt Leif W @@ -1423,11 +1363,8 @@ Leon Breedt Leon Winter Leonardo Rosati Leonardo Taccari -Leszek Kubik Li Xinwei Liam Healy -Liam Warfield -LigH-de on github lijian996 on github Lijo Antony lilongyan-huawei on github @@ -1442,7 +1379,6 @@ Lior Kaplan Lisa Xu Liviu Chircu Liza Alenchery -lllaffer on github Lloyd Fournier Lluís Batlle i Rossell locpyl-tidnyd on github @@ -1469,7 +1405,6 @@ Luke Amery Luke Call Luke Dashjr Luke Granger-Brown -luminixinc on github Luo Jinghua Luong Dinh Dung Luz Paz @@ -1518,14 +1453,12 @@ Marcos Diazr Marcus Hoffmann Marcus Klein Marcus Sundberg -Marcus T Marcus Webster Marian Klymov Mario Schroeder Mark Brand Mark Butler Mark Davies -Mark Dodgson Mark Hamilton Mark Incley Mark Karpeles @@ -1591,7 +1524,6 @@ Matt McClure Matt Veenstra Matt Witherspoon Matt Wixson -Matteo Baccan Matteo Bignotti Matteo Bignottignotti Matteo Rocco @@ -1612,7 +1544,6 @@ Max Dymond Max Katsev Max Kellermann Max Khon -Max Mehl Max Peal Max Savenkov Max Zettlmeißl @@ -1623,12 +1554,9 @@ Maxime Larocque Maxime Legros mbeifuss on github mccormickt12 on github -Median Median Stride -mehatzri on github Mehmet Bozkurt Mekonikum Melissa Mears -Melroy van den Berg Mert Yazıcıoğlu Mettgut Jamalla Michael Afanasiev @@ -1746,7 +1674,6 @@ Nathaniel R. Lewis Nathaniel Waisbrot Naveen Chandran Naveen Noel -Neal McBurnett Neal Poole nedres on github neex on github @@ -1756,7 +1683,6 @@ Neil Bowers Neil Dunbar Neil Kolban Neil Spring -neutric on github nevv on HackerOne/curl Niall O'Reilly niallor on github @@ -1764,8 +1690,6 @@ nian6324 on github nianxuejie on github Nic Roets Nicholas Maniscalco -Nick Banks -Nick Coghlan Nick Draffen Nick Gimbrone Nick Humfrey @@ -1781,7 +1705,6 @@ Nicolas Grekas Nicolas Guillier Nicolas Morey-Chaisemartin Nicolas Sterchele -Niels Martignène Niels van Tongeren Nikita Schmidt Nikitinskit Dmitriy @@ -1790,7 +1713,6 @@ Niklas Hambüchen Nikolai Kondrashov Nikos Mavrogiannopoulos Nikos Tsipinakis -nimaje on github niner on github Ning Dong Nir Soffer @@ -1807,7 +1729,6 @@ Norbert Kett Norbert Novotny nosajsnikta on github NTMan on Github -Nuru on github Octavio Schroeder Ofer Okhin Vasilij @@ -1897,7 +1818,6 @@ Pavel Volgarev Pavol Markovic Pawel A. Gajda Pawel Kierski -Paweł Kowalski Paweł Wegner Pedro Larroy Pedro Monreal @@ -1948,7 +1868,6 @@ Phil Lisiecki Phil Pellouchoud Philip Craig Philip Gladstone -Philip H Philip Langdale Philip Prindeville Philipp Klaus Krause @@ -1964,7 +1883,6 @@ Pierre Joye Pierre Yager Pierre Ynard Pierre-Yves Bigourdan -Pierrick Charron Piotr Dobrogost Piotr Komborski Po-Chuan Hsieh @@ -1974,7 +1892,6 @@ Poul T Lomholt Pramod Sharma Prash Dush Praveen Pvs -Prithvi MK Priyanka Shah Przemysław Tomaszewski pszemus on github @@ -1985,7 +1902,6 @@ Quagmire Quanah Gibson-Mount Quentin Balland Quinn Slack -r-a-sattarov on github R. Dennis Steed Radek Zajic Radoslav Georgiev @@ -2026,7 +1942,6 @@ Red Hat Product Security Reed Loden Reinhard Max Reinout van Schouwen -RekGRpth on github Remco van Hooff Remi Gacogne Remo E @@ -2040,10 +1955,8 @@ Rene Bernhardt Rene Rebe Reuven Wachtfogel Reza Arbab -Rianov Viacheslav Ricardo Cadime Ricardo Gomes -Ricardo M. Correia Ricardo Martins Rich Burridge Rich FitzJohn @@ -2086,7 +1999,6 @@ Rider Linden RiderALT on github Rikard Falkeborn rl1987 on github -Rob Boeckermann Rob Cotrone Rob Crittenden Rob Davies @@ -2096,8 +2008,6 @@ Rob Stanzel Rob Ward Robert A. Monat Robert B. Harris -Robert Brose -Robert Charles Muir Robert D. Young Robert Dunaj Robert Foreman @@ -2110,7 +2020,6 @@ Robert Ronto Robert Schumann Robert Weaver Robert Wruck -Robin A. Meade Robin Cornelius Robin Douine Robin Johnson @@ -2161,7 +2070,6 @@ Ryan Mast Ryan Nelson Ryan Schmidt Ryan Scott -Ryan Sleevi Ryan Winograd ryancaicse on github Ryuichi KAWAMATA @@ -2187,15 +2095,12 @@ Samuel Thibault Samuel Tranchet Sander Gates Sandor Feldi -Sandro Jaeckel Santhana Todatry Santino Keupp Saqib Ali Sara Golemon Saran Neti Sascha Swiercy -Sascha Zengler -Satadru Pramanik Saul good Saurav Babu sayrer on github @@ -2216,7 +2121,6 @@ Sebastian Haglund Sebastian Mundry Sebastian Pohlschmidt Sebastian Rasmussen -Sebastian Sterk Senthil Raja Velu Sergei Kuzmin Sergei Nikulov @@ -2234,7 +2138,6 @@ Serj Kalichev Seshubabu Pasam Seth Mos Sevan Janiyan -Sgharat on github Sh Diao Shachaf Ben-Kiki Shailesh Kapse @@ -2253,11 +2156,9 @@ shithappens2016 on github Shlomi Fish Shmulik Regev Siddhartha Prakash Jain -siddharthchhabrap on github Sidney San Martín Siegfried Gyuricsko silveja1 on github -Simon Berger Simon Chalifoux Simon Dick Simon H. @@ -2281,19 +2182,16 @@ Spork Schivago sspiri on github sstruchtrup on github Stadler Stephan -Stan Hu Stan van de Burgt Stanislav Ivochkin Stanislav Zidek Stathis Kapnidis -Stav Nir steelman on github Stefan Agner Stefan Bühler Stefan Eissing Stefan Esser Stefan Grether -Stefan Huber Stefan Kanthak Stefan Karpinski Stefan Krause @@ -2312,12 +2210,9 @@ Stephan Bergmann Stephan Lagerholm Stephan Mühlstrasser Stephan Szabo -Stephane Pellegrino -Stephen Boost Stephen Brokenshire Stephen Collyer Stephen Kick -Stephen M. Coakley Stephen More Stephen Toub Sterling Hughes @@ -2337,7 +2232,6 @@ Steven Gu Steven M. Schweda Steven Parkes Steven Penny -Stewart Gebbie Stian Soiland-Reyes Stoned Elipot stootill on github @@ -2364,7 +2258,6 @@ Tae Hyoung Ahn Taiyu Len Taneli Vähäkangas Tanguy Fautre -Taras Kushnir tarek112 on github Tatsuhiro Tsujikawa tawmoto on github @@ -2384,7 +2277,6 @@ Thomas Braun Thomas Danielsson Thomas Gamper Thomas Glanzmann -Thomas Guillem Thomas J. Moore Thomas Klausner Thomas L. Shinnick @@ -2433,7 +2325,6 @@ Tobias Hieta Tobias Hintze Tobias Lindgren Tobias Markus -Tobias Nießen Tobias Nyholm Tobias Rundström Tobias Stoeckmann @@ -2445,7 +2336,6 @@ Todd Short Todd Vierling Tom Benoist Tom Donovan -Tom Eccles Tom G. Christensen Tom Grace Tom Greenslade @@ -2503,13 +2393,11 @@ Ulf Samuelsson Ulrich Doehner Ulrich Telle Ulrich Zadow -updatede on github UrsusArctos on github User Sg ustcqidi on github Vadim Grinshpun Valentin David -Valentin Richter Valentyn Korniienko Valentín Gutiérrez Valerii Zapodovnikov @@ -2539,13 +2427,11 @@ Vincent Sanders Vincent Torri vitaha85 on github Vitaly Varyvdin -vl409 on github Vlad Grachov Vlad Ureche Vladimir Grishchenko Vladimir Kotal Vladimir Lazarenko -Vladimir Panteleev Vladimir Varlamov Vlastimil Ovčáčík Vojtech Janota @@ -2554,7 +2440,6 @@ Vojtěch Král Volker Schmid Vsevolod Novikov vshmuk on hackerone -vvb2060 on github Vyron Tsingaras W. Mark Kubacki Waldek Kozba @@ -2575,7 +2460,6 @@ Wham Bang Wilfredo Sanchez Will Dietz Will Roberts -Willem Hoek Willem Sparreboom William A. Rowe Jr William Ahern @@ -2583,7 +2467,6 @@ William Desportes wmsch on github wncboy on github Wojciech Zwiefka -Wolf Vollprecht Wouter Van Rooy Wu Yongzheng Wyatt O'Day @@ -2594,7 +2477,6 @@ XhmikosR on github XhstormR on github Xiang Xiao Xiangbin Li -Xiaoke Wang Xiaoyin Liu XmiliaH on github xnynx on github @@ -2655,4 +2537,3 @@ zzq1015 on github ウさん 不确定 加藤郁之 -梦终无痕 diff --git a/3rdparty/curl-7.84.0/docs/TODO b/3rdparty/curl-7.80.0/docs/TODO similarity index 91% rename from 3rdparty/curl-7.84.0/docs/TODO rename to 3rdparty/curl-7.80.0/docs/TODO index 97afcec3..dc03f303 100644 --- a/3rdparty/curl-7.84.0/docs/TODO +++ b/3rdparty/curl-7.80.0/docs/TODO @@ -7,14 +7,14 @@ Things that could be nice to do in the future Things to do in project curl. Please tell us what you think, contribute and - send us patches that improve things. + send us patches that improve things! Be aware that these are things that we could do, or have once been considered things we could do. If you want to work on any of these areas, please consider bringing it up for discussions first on the mailing list so that we - all agree it is still a good idea for the project. + all agree it is still a good idea for the project! - All bugs documented in the KNOWN_BUGS document are subject for fixing. + All bugs documented in the KNOWN_BUGS document are subject for fixing! 1. libcurl 1.1 TFO support on Windows @@ -30,6 +30,7 @@ 1.11 minimize dependencies with dynamically loaded modules 1.12 updated DNS server while running 1.13 c-ares and CURLOPT_OPENSOCKETFUNCTION + 1.14 Typesafe curl_easy_setopt() 1.15 Monitor connections in the connection pool 1.16 Try to URL encode given URL 1.17 Add support for IRIs @@ -39,7 +40,9 @@ 1.21 netrc caching and sharing 1.22 CURLINFO_PAUSE_STATE 1.23 Offer API to flush the connection pool + 1.24 TCP Fast Open for windows 1.25 Expose tried IP addresses that failed + 1.27 hardcode the "localhost" addresses 1.28 FD_CLOEXEC 1.29 Upgrade to websockets 1.30 config file parsing @@ -64,27 +67,25 @@ 4.1 HOST 4.2 Alter passive/active on failure and retry 4.3 Earlier bad letter detection - 4.4 Support CURLOPT_PREQUOTE for dir listings too 4.5 ASCII support 4.6 GSSAPI via Windows SSPI 4.7 STAT for LIST without data connection + 4.8 Option to ignore private IP addresses in PASV response 5. HTTP + 5.1 Better persistency for HTTP 1.0 5.2 Set custom client ip when using haproxy protocol 5.3 Rearrange request header order 5.4 Allow SAN names in HTTP/2 server push 5.5 auth= in URLs 5.6 alt-svc should fallback if alt-svc does not work - 5.7 Require HTTP version X or higher 6. TELNET 6.1 ditch stdin 6.2 ditch telnet-specific select 6.3 feature negotiation debug data - 6.4 exit immediately upon connection if stdin is /dev/null 7. SMTP - 7.1 Passing NOTIFY option to CURLOPT_MAIL_RCPT 7.2 Enhanced capability support 7.3 Add CURLOPT_MAIL_CLIENT option @@ -108,14 +109,12 @@ 12. FILE 12.1 Directory listing for FILE: - 13. TLS + 13. SSL 13.1 TLS-PSK with OpenSSL 13.2 Provide mutex locking API - 13.3 Defeat TLS fingerprinting 13.4 Cache/share OpenSSL contexts 13.5 Export session ids 13.6 Provide callback for cert verification - 13.7 Less memory massaging with Schannel 13.8 Support DANE 13.9 TLS record padding 13.10 Support Authority Information Access certificate extension (AIA) @@ -138,17 +137,17 @@ 17. SSH protocols 17.1 Multiplexing 17.2 Handle growing SFTP files - 17.3 Read keys from ~/.ssh/id_ecdsa, id_ed25519 17.4 Support CURLOPT_PREQUOTE 17.5 SSH over HTTPS proxy with more backends - 17.6 SFTP with SCP:// 18. Command line tool 18.1 sync 18.2 glob posts + 18.3 prevent file overwriting 18.4 --proxycommand 18.5 UTF-8 filenames in Content-Disposition 18.6 Option to make -Z merge lined based outputs on stdout + 18.7 at least N milliseconds between requests 18.8 Consider convenience options for JSON and XML? 18.9 Choose the name of file in braces for complex URLs 18.10 improve how curl works in a windows console window @@ -183,7 +182,8 @@ 20.5 Add support for concurrent connections 20.6 Use the RFC6265 test suite 20.7 Support LD_PRELOAD on macOS - 20.8 Run web-platform-tests URL tests + 20.8 Run web-platform-tests url tests + 20.9 Bring back libssh tests on Travis 21. MQTT 21.1 Support rate-limiting @@ -194,10 +194,6 @@ 1.1 TFO support on Windows - libcurl supports the CURLOPT_TCP_FASTOPEN option since 7.49.0 for Linux and - Mac OS. Windows supports TCP Fast Open starting with Windows 10, version 1607 - and we should add support for it. - TCP Fast Open is supported on several platforms but not on Windows. Work on this was once started but never finished. @@ -277,7 +273,7 @@ We can create a system with loadable modules/plug-ins, where these modules would be the ones that link to 3rd party libs. That would allow us to avoid having to load ALL dependencies since only the necessary ones for this - app/invoke/used protocols would be necessary to load. See + app/invoke/used protocols would be necessary to load. See https://github.com/curl/curl/issues/349 1.12 updated DNS server while running @@ -300,6 +296,23 @@ See https://github.com/curl/curl/issues/2734 +1.14 Typesafe curl_easy_setopt() + + One of the most common problems in libcurl using applications is the lack of + type checks for curl_easy_setopt() which happens because it accepts varargs + and thus can take any type. + + One possible solution to this is to introduce a few different versions of the + setopt version for the different kinds of data you can set. + + curl_easy_set_num() - sets a long value + + curl_easy_set_large() - sets a curl_off_t value + + curl_easy_set_ptr() - sets a pointer + + curl_easy_set_cb() - sets a callback PLUS its callback data + 1.15 Monitor connections in the connection pool libcurl's connection cache or pool holds a number of open connections for the @@ -309,11 +322,10 @@ reuse purpose it is verified that it is still alive. Those connections may get closed by the server side for idleness or they may - get an HTTP/2 ping from the peer to verify that they are still alive. By - adding monitoring of the connections while in the pool, libcurl can detect - dead connections (and close them) better and earlier, and it can handle - HTTP/2 pings to keep such ones alive even when not actively doing transfers - on them. + get a HTTP/2 ping from the peer to verify that they are still alive. By adding + monitoring of the connections while in the pool, libcurl can detect dead + connections (and close them) better and earlier, and it can handle HTTP/2 + pings to keep such ones alive even when not actively doing transfers on them. 1.16 Try to URL encode given URL @@ -354,7 +366,7 @@ 1.20 SRV and URI DNS records Offer support for resolving SRV and URI DNS records for libcurl to know which - server to connect to for various protocols (including HTTP). + server to connect to for various protocols (including HTTP!). 1.21 netrc caching and sharing @@ -374,15 +386,31 @@ An API could allow a forced flush or just a forced loop that would properly close all connections that have been closed by the server already. +1.24 TCP Fast Open for windows + + libcurl supports the CURLOPT_TCP_FASTOPEN option since 7.49.0 for Linux and + Mac OS. Windows supports TCP Fast Open starting with Windows 10, version 1607 + and we should add support for it. + 1.25 Expose tried IP addresses that failed - When libcurl fails to connect to a host, it could offer the application the - addresses that were used in the attempt. Source + dest IP, source + dest port - and protocol (UDP or TCP) for each failure. Possibly as a callback. Perhaps - also provide "reason". + When libcurl fails to connect to a host, it should be able to offer the + application the list of IP addresses that were used in the attempt. https://github.com/curl/curl/issues/2126 +1.27 hardcode the "localhost" addresses + + There's this new spec getting adopted that says "localhost" should always and + unconditionally be a local address and not get resolved by a DNS server. A + fine way for curl to fix this would be to simply hard-code the response to + 127.0.0.1 and/or ::1 (depending on what IP versions that are requested). This + is what the browsers probably will do with this hostname. + + https://bugzilla.mozilla.org/show_bug.cgi?id=1220810 + + https://tools.ietf.org/html/draft-ietf-dnsop-let-localhost-be-localhost-02 + 1.28 FD_CLOEXEC It sets the close-on-exec flag for the file descriptor, which causes the file @@ -522,7 +550,7 @@ HOST is a command for a client to tell which host name to use, to offer FTP servers named-based virtual hosting: - https://datatracker.ietf.org/doc/html/rfc7151 + https://tools.ietf.org/html/rfc7151 4.2 Alter passive/active on failure and retry @@ -536,13 +564,6 @@ Make the detection of (bad) %0d and %0a codes in FTP URL parts earlier in the process to avoid doing a resolve and connect in vain. -4.4 Support CURLOPT_PREQUOTE for dir listings too - - The lack of support is mostly an oversight and requires the FTP state machine - to get updated to get fixed. - - https://github.com/curl/curl/issues/8602 - 4.5 ASCII support FTP ASCII transfers do not follow RFC959. They do not convert the data @@ -562,8 +583,19 @@ This is not detailed in any FTP specification. +4.8 Option to ignore private IP addresses in PASV response + + Some servers respond with and some other FTP client implementations can + ignore private (RFC 1918 style) IP addresses when received in PASV responses. + To consider for libcurl as well. See https://github.com/curl/curl/issues/1455 + 5. HTTP +5.1 Better persistency for HTTP 1.0 + + "Better" support for persistent connections over HTTP 1.0 + https://curl.se/bug/feature.cgi?id=1089001 + 5.2 Set custom client ip when using haproxy protocol This would allow testing servers with different client ip addresses (without @@ -612,14 +644,6 @@ See https://github.com/curl/curl/issues/4908 -5.7 Require HTTP version X or higher - - curl and libcurl provide options for trying higher HTTP versions (for example - HTTP/2) but then still allows the server to pick version 1.1. We could - consider adding a way to require a minimum version. - - See https://github.com/curl/curl/issues/7980 - 6. TELNET 6.1 ditch stdin @@ -638,24 +662,9 @@ Add telnet feature negotiation data to the debug callback as header data. -6.4 exit immediately upon connection if stdin is /dev/null - - If it did, curl could be used to probe if there's an server there listening - on a specific port. That is, the following command would exit immediately - after the connection is established with exit code 0: - - curl -s --connect-timeout 2 telnet://example.com:80 NOTIFY=SUCCESS,FAILURE" ); - - https://github.com/curl/curl/issues/8232 - 7.2 Enhanced capability support Add the ability, for an application that uses libcurl, to obtain the list of @@ -737,7 +746,7 @@ output should probably be the same as/similar to FTP. -13. TLS +13. SSL 13.1 TLS-PSK with OpenSSL @@ -754,14 +763,6 @@ library, so that the same application code can use mutex-locking independently of OpenSSL or GnutTLS being used. -13.3 Defeat TLS fingerprinting - - By changing the order of TLS extensions provided in the TLS handshake, it is - sometimes possible to circumvent TLS fingerprinting by servers. The TLS - extension order is of course not the only way to fingerprint a client. - - See https://github.com/curl/curl/issues/8119 - 13.4 Cache/share OpenSSL contexts "Look at SSL cafile - quick traces look to me like these are done on every @@ -790,14 +791,7 @@ OpenSSL supports a callback for customised verification of the peer certificate, but this does not seem to be exposed in the libcurl APIs. Could - it be? There's so much that could be done if it were. - -13.7 Less memory massaging with Schannel - - The Schannel backend does a lot of custom memory management we would rather - avoid: the repeated alloc + free in sends and the custom memory + realloc - system for encrypted and decrypted data. That should be avoided and reduced - for 1) efficiency and 2) safety. + it be? There's so much that could be done if it were! 13.8 Support DANE @@ -858,7 +852,7 @@ that previously (in older TLS version) were not set. The clienthello extension adds padding to avoid that size range. - https://datatracker.ietf.org/doc/html/rfc7685 + https://tools.ietf.org/html/rfc7685 https://github.com/curl/curl/issues/2299 14. GnuTLS @@ -931,18 +925,10 @@ https://github.com/curl/curl/issues/4344 -17.3 Read keys from ~/.ssh/id_ecdsa, id_ed25519 - - The libssh2 backend in curl is limited to only reading keys from id_rsa and - id_dsa, which makes it fail connecting to servers that use more modern key - types. - - https://github.com/curl/curl/issues/8586 - 17.4 Support CURLOPT_PREQUOTE The two other QUOTE options are supported for SFTP, but this was left out for - unknown reasons. + unknown reasons! 17.5 SSH over HTTPS proxy with more backends @@ -951,12 +937,6 @@ functionality with the libssh2 backend. Presumably, this support can/could be added for the other backends as well. -17.6 SFTP with SCP:// - - OpenSSH 9 switched their 'scp' tool to speak SFTP under the hood. Going - forward it might be worth having curl or libcurl attempt SFTP if SCP fails to - follow suite. - 18. Command line tool 18.1 sync @@ -973,6 +953,14 @@ Globbing support for -d and -F, as in 'curl -d "name=foo[0-9]" URL'. This is easily scripted though. +18.3 prevent file overwriting + + Add an option that prevents curl from overwriting existing local files. When + used, and there already is an existing file with the target file name + (either -O or -o), a number should be appended (and increased if already + existing). So that index.html becomes first index.html.1 and then + index.html.2 etc. + 18.4 --proxycommand Allow the user to make curl run a command and use its stdio to make requests @@ -998,6 +986,17 @@ https://github.com/curl/curl/issues/5175 +18.7 at least N milliseconds between requests + + Allow curl command lines issue a lot of request against services that limit + users to no more than N requests/second or similar. Could be implemented with + an option asking that at least a certain time has elapsed since the previous + request before the next one will be performed. Example: + + $ curl "https://example.com/api?input=[1-1000]" -d yadayada --after 500 + + See https://github.com/curl/curl/issues/3920 + 18.8 Consider convenience options for JSON and XML? Could we add `--xml` or `--json` to add headers needed to call rest API: @@ -1131,9 +1130,9 @@ 18.21 retry on the redirected-to URL When curl is told to --retry a failed transfer and follows redirects, it - might get an HTTP 429 response from the redirected-to URL and not the - original one, which then could make curl decide to rather retry the transfer - on that URL only instead of the original operation to the original URL. + might get a HTTP 429 response from the redirected-to URL and not the original + one, which then could make curl decide to rather retry the transfer on that + URL only instead of the original operation to the original URL. Perhaps extra emphasized if the original transfer is a large POST that redirects to a separate GET, and that GET is what gets the 529 @@ -1275,18 +1274,25 @@ properly. Look into making the preload support in runtests.pl portable such that it uses DYLD_INSERT_LIBRARIES on macOS. -20.8 Run web-platform-tests URL tests +20.8 Run web-platform-tests url tests - Run web-platform-tests URL tests and compare results with browsers on wpt.fyi + Run web-platform-tests url tests and compare results with browsers on wpt.fyi It would help us find issues to fix and help us document where our parser differs from the WHATWG URL spec parsers. See https://github.com/curl/curl/issues/4477 +20.9 Bring back libssh tests on Travis + + In https://github.com/curl/curl/pull/7012 we remove the libssh builds and + tests from Travis CI due to them not working. This should be remedied and + libssh builds be brought back. + + 21. MQTT 21.1 Support rate-limiting The rate-limiting logic is done in the PERFORMING state in multi.c but MQTT - is not (yet) implemented to use that. + is not (yet) implemented to use that! diff --git a/3rdparty/curl-7.84.0/docs/TheArtOfHttpScripting.md b/3rdparty/curl-7.80.0/docs/TheArtOfHttpScripting.md similarity index 95% rename from 3rdparty/curl-7.84.0/docs/TheArtOfHttpScripting.md rename to 3rdparty/curl-7.80.0/docs/TheArtOfHttpScripting.md index 78dbd7a8..83b0905d 100644 --- a/3rdparty/curl-7.84.0/docs/TheArtOfHttpScripting.md +++ b/3rdparty/curl-7.80.0/docs/TheArtOfHttpScripting.md @@ -30,7 +30,7 @@ request a particular action, and then the server replies a few text lines before the actual requested content is sent to the client. - The client, curl, sends an HTTP request. The request contains a method (like + The client, curl, sends a HTTP request. The request contains a method (like GET, POST, HEAD etc), a number of request headers and sometimes a request body. The HTTP server responds with a status line (indicating if things went well), response headers and most often also a response body. The "body" part @@ -59,7 +59,7 @@ want to know the amount of milliseconds between two points in a transfer. For those, and other similar situations, the [`--trace-time`](https://curl.se/docs/manpage.html#--trace-time) option - is what you need. It will prepend the time to each trace output line: + is what you need. it will prepend the time to each trace output line: curl --trace-ascii d.txt --trace-time http://example.com/ @@ -103,7 +103,7 @@ The port number you specify in the URL is the number that the server uses to offer its services. Sometimes you may use a proxy, and then you may need to specify that proxy's port number separately from what curl needs to - connect to the server. Like when using an HTTP proxy on port 4321: + connect to the server. Like when using a HTTP proxy on port 4321: curl --proxy http://proxy.example.org:4321 http://remote.example.org/ @@ -166,7 +166,7 @@ A single curl command line may involve one or many URLs. The most common case is probably to just use one, but you can specify any amount of URLs. Yes - any. No limits. You will then get requests repeated over and over for all the + any. No limits. you will then get requests repeated over and over for all the given URLs. Example, send two GETs: @@ -207,7 +207,7 @@ ## Forms explained - Forms are the general way a website can present an HTML page with fields for + Forms are the general way a website can present a HTML page with fields for the user to enter data in, and then press some kind of 'OK' or 'Submit' button to get that data sent to the server. The server then typically uses the posted data to decide how to act. Like using the entered words to search @@ -270,7 +270,7 @@ And to use curl to post this form with the same data filled in as before, we could do it like: - curl --data "birthyear=1905&press=%20OK%20" http://www.example.com/when/junk.cgi + curl --data "birthyear=1905&press=%20OK%20" http://www.example.com/when.cgi This kind of POST will use the Content-Type `application/x-www-form-urlencoded` and is the most widely used POST kind. @@ -336,9 +336,9 @@ ## Figure Out What A POST Looks Like - When you are about to fill in a form and send it to a server by using curl - instead of a browser, you are of course interested in sending a POST exactly - the way your browser does. + When you are about fill in a form and send to a server by using curl instead + of a browser, you are of course interested in sending a POST exactly the way + your browser does. An easy way to get to see this, is to save the HTML page with the form on your local disk, modify the 'method' to a GET, and press the submit button @@ -351,11 +351,11 @@ ## PUT - Perhaps the best way to upload data to an HTTP server is to use PUT. Then + Perhaps the best way to upload data to a HTTP server is to use PUT. Then again, this of course requires that someone put a program or script on the - server end that knows how to receive an HTTP PUT stream. + server end that knows how to receive a HTTP PUT stream. - Put a file to an HTTP server with curl: + Put a file to a HTTP server with curl: curl --upload-file uploadfile http://www.example.com/receive.cgi @@ -386,8 +386,8 @@ ## Proxy Authentication - Sometimes your HTTP access is only available through the use of an HTTP - proxy. This seems to be especially common at various companies. An HTTP proxy + Sometimes your HTTP access is only available through the use of a HTTP + proxy. This seems to be especially common at various companies. A HTTP proxy may require its own user and password to allow the client to get through to the Internet. To specify those with curl, run something like: @@ -416,7 +416,7 @@ ## Referer - An HTTP request may include a 'referer' field (yes it is misspelled), which + A HTTP request may include a 'referer' field (yes it is misspelled), which can be used to tell from which URL the client got to this particular resource. Some programs/scripts check the referer field of requests to verify that this was not arriving from an external site or an unknown page. While @@ -435,7 +435,7 @@ applications use this information to decide how to display pages. Silly web programmers try to make different pages for users of different browsers to make them look the best possible for their particular browsers. They usually - also do different kinds of JavaScript, VBScript etc. + also do different kinds of javascript, vbscript etc. At times, you will see that getting a page with curl will not return the same page that you see when getting the page with your browser. Then you know it @@ -471,15 +471,15 @@ If you use curl to POST to a site that immediately redirects you to another page, you can safely use [`--location`](https://curl.se/docs/manpage.html#-L) (`-L`) and - `--data`/`--form` together. Curl will only use POST in the first request, and + `--data`/`--form` together. curl will only use POST in the first request, and then revert to GET in the following operations. ## Other redirects - Browsers typically support at least two other ways of redirects that curl + Browser typically support at least two other ways of redirects that curl does not: first the html may contain a meta refresh tag that asks the browser to load a specific URL after a set number of seconds, or it may use - JavaScript to do it. + javascript to do it. # Cookies @@ -560,7 +560,7 @@ Curl supports encrypted fetches when built to use a TLS library and it can be built to use one out of a fairly large set of libraries - `curl -V` will show - which one your curl was built to use (if any!). To get a page from an HTTPS + which one your curl was built to use (if any!). To get a page from a HTTPS server, simply run curl like: curl https://secure.example.com @@ -572,7 +572,7 @@ side certificates. All certificates are locked with a pass phrase, which you need to enter before the certificate can be used by curl. The pass phrase can be specified on the command line or if not, entered interactively when - curl queries for it. Use a certificate with curl on an HTTPS server like: + curl queries for it. Use a certificate with curl on a HTTPS server like: curl --cert mycert.pem https://secure.example.com @@ -648,13 +648,13 @@ make sure you got there through their login page) so you should make a habit of first getting the login-form page to capture the cookies set there. - Some web-based login systems feature various amounts of JavaScript, and + Some web-based login systems feature various amounts of javascript, and sometimes they use such code to set or modify cookie contents. Possibly they do that to prevent programmed logins, like this manual describes how to... Anyway, if reading the code is not enough to let you repeat the behavior manually, capturing the HTTP requests done by your browsers and analyzing the sent cookies is usually a working method to work out how to shortcut the - JavaScript need. + javascript need. In the actual `
` tag for the login, lots of sites fill-in random/session or otherwise secretly generated hidden tags and you may need diff --git a/3rdparty/curl-7.84.0/docs/URL-SYNTAX.md b/3rdparty/curl-7.80.0/docs/URL-SYNTAX.md similarity index 92% rename from 3rdparty/curl-7.84.0/docs/URL-SYNTAX.md rename to 3rdparty/curl-7.80.0/docs/URL-SYNTAX.md index 0b452f87..8b112361 100644 --- a/3rdparty/curl-7.84.0/docs/URL-SYNTAX.md +++ b/3rdparty/curl-7.80.0/docs/URL-SYNTAX.md @@ -5,7 +5,7 @@ The official "URL syntax" is primarily defined in these two different specifications: - - [RFC 3986](https://datatracker.ietf.org/doc/html/rfc3986) (although URL is called + - [RFC 3986](https://tools.ietf.org/html/rfc3986) (although URL is called "URI" in there) - [The WHATWG URL Specification](https://url.spec.whatwg.org/) @@ -20,7 +20,7 @@ changes over time. URL parsers as implemented in browsers, libraries and tools usually opt to support one of the mentioned specifications. Bugs, differences in interpretations and the moving nature of the WHATWG spec does however make it -unlikely that multiple parsers treat URLs the same way. +unlikely that multiple parsers treat URLs the exact same way! ## Security @@ -63,13 +63,10 @@ inter-operate better with URLs that appear in the wild. ### spaces -A URL provided to curl cannot contain spaces. They need to be provided URL -encoded to be accepted in a URL by curl. - -An exception to this rule: `Location:` response headers that indicate to a -client where a resource has been redirected to, sometimes contain spaces. This -is a violation of RFC 3986 but is fine in the WHATWG spec. curl handles these -by re-encoding them to `%20`. +In particular `Location:` headers that indicate to the client where a resource +has been redirected to, sometimes contain spaces. This is a violation of RFC +3986 but is fine in the WHATWG spec. curl handles these by re-encoding them to +`%20`. ### non-ASCII @@ -153,7 +150,7 @@ since it often means passing around the password in plain text and is thus a security risk. URLs for IMAP, POP3 and SMTP also support *login options* as part of the -userinfo field. They are provided as a semicolon after the password and then +userinfo field. they are provided as a semicolon after the password and then the options. ## Hostname @@ -174,9 +171,9 @@ brackets). For example: ### "localhost" -Starting in curl 7.77.0, curl uses loopback IP addresses for the name -`localhost`: `127.0.0.1` and `::1`. It does not resolve the name using the -resolver functions. +Starting in curl 7.77.0, curl will use loopback IP addresses for the name +`localhost`: `127.0.0.1` and `::1`. It will not try to resolve the name using +the resolver functions. This is done to make sure the host accessed is truly the localhost - the local machine. @@ -220,7 +217,7 @@ directory listing for the root / home directory will be returned. FTP servers typically put the user in its "home directory" after login, which then differs between users. To explicitly specify the root directory of an FTP -server, start the path with double slash `//` or `/%2f` (2F is the hexadecimal +server start the path with double slash `//` or `/%2f` (2F is the hexadecimal value of the ascii code for the slash). ## FILE @@ -317,13 +314,13 @@ Name, Attributes, Scope, Filter and Extension for a LDAP search. Each field is separated by a question mark and when that field is not required an empty string with the question mark separator should be included. -Search for the DN as `My Organization`: +Search for the DN as `My Organisation`: - ldap://ldap.example.com/o=My%20Organization + ldap://ldap.example.com/o=My%20Organisation the same search but will only return postalAddress attributes: - ldap://ldap.example.com/o=My%20Organization?postalAddress + ldap://ldap.example.com/o=My%20Organisation?postalAddress Search for an empty DN and request information about the `rootDomainNamingContext` attribute for an Active Directory server: @@ -331,7 +328,7 @@ Search for an empty DN and request information about the ldap://ldap.example.com/?rootDomainNamingContext For more information about the individual components of a LDAP URL please -see [RFC 4516](https://datatracker.ietf.org/doc/html/rfc4516). +see [RFC 4516](https://tools.ietf.org/html/rfc4516). ## POP3 diff --git a/3rdparty/curl-7.84.0/docs/VERSIONS.md b/3rdparty/curl-7.80.0/docs/VERSIONS.md similarity index 100% rename from 3rdparty/curl-7.84.0/docs/VERSIONS.md rename to 3rdparty/curl-7.80.0/docs/VERSIONS.md diff --git a/3rdparty/curl-7.84.0/docs/cmdline-opts/CMakeLists.txt b/3rdparty/curl-7.80.0/docs/cmdline-opts/CMakeLists.txt similarity index 93% rename from 3rdparty/curl-7.84.0/docs/cmdline-opts/CMakeLists.txt rename to 3rdparty/curl-7.80.0/docs/cmdline-opts/CMakeLists.txt index fe7870f5..ae25c5c4 100644 --- a/3rdparty/curl-7.84.0/docs/cmdline-opts/CMakeLists.txt +++ b/3rdparty/curl-7.80.0/docs/cmdline-opts/CMakeLists.txt @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,8 +18,6 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # -# SPDX-License-Identifier: curl -# ########################################################################### set(MANPAGE "${CURL_BINARY_DIR}/docs/curl.1") diff --git a/3rdparty/curl-7.84.0/docs/cmdline-opts/MANPAGE.md b/3rdparty/curl-7.80.0/docs/cmdline-opts/MANPAGE.md similarity index 88% rename from 3rdparty/curl-7.84.0/docs/cmdline-opts/MANPAGE.md rename to 3rdparty/curl-7.80.0/docs/cmdline-opts/MANPAGE.md index e35c826c..f7f09eb1 100644 --- a/3rdparty/curl-7.84.0/docs/cmdline-opts/MANPAGE.md +++ b/3rdparty/curl-7.80.0/docs/cmdline-opts/MANPAGE.md @@ -1,9 +1,3 @@ - - # curl man page generator This is the curl man page generator. It generates a single nroff man page @@ -35,8 +29,6 @@ Each file has a set of meta-data and a body of text. See-also: (space separated list of related options, no dashes) Help: (short text for the --help output for this option) Example: (example command line, without "curl" and can use `$URL`) - c: (copyright line) - SPDX-License-Identifier: curl --- (end of meta-data) ### Body @@ -48,9 +40,6 @@ correct markup that shows both short and long version. Text written within `*asterisks*` will get shown using italics. Text within two `**asterisks**` will get shown using bold. -Text that is prefixed with a space will be treated like an "example" and will -be output in monospace. - ## Header and footer `page-header` is the file that will be output before the generated options diff --git a/3rdparty/curl-7.84.0/docs/cmdline-opts/Makefile.am b/3rdparty/curl-7.80.0/docs/cmdline-opts/Makefile.am similarity index 92% rename from 3rdparty/curl-7.84.0/docs/cmdline-opts/Makefile.am rename to 3rdparty/curl-7.80.0/docs/cmdline-opts/Makefile.am index df38e192..f416d553 100644 --- a/3rdparty/curl-7.84.0/docs/cmdline-opts/Makefile.am +++ b/3rdparty/curl-7.80.0/docs/cmdline-opts/Makefile.am @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,8 +18,6 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # -# SPDX-License-Identifier: curl -# ########################################################################### AUTOMAKE_OPTIONS = foreign no-dependencies diff --git a/3rdparty/curl-7.84.0/docs/cmdline-opts/Makefile.in b/3rdparty/curl-7.80.0/docs/cmdline-opts/Makefile.in similarity index 98% rename from 3rdparty/curl-7.84.0/docs/cmdline-opts/Makefile.in rename to 3rdparty/curl-7.80.0/docs/cmdline-opts/Makefile.in index d17915d2..760fc78f 100644 --- a/3rdparty/curl-7.84.0/docs/cmdline-opts/Makefile.in +++ b/3rdparty/curl-7.80.0/docs/cmdline-opts/Makefile.in @@ -21,7 +21,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -34,8 +34,6 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # -# SPDX-License-Identifier: curl -# ########################################################################### #*************************************************************************** @@ -45,7 +43,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2021, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -58,8 +56,6 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # -# SPDX-License-Identifier: curl -# ########################################################################### # Shared between Makefile.am and CMakeLists.txt VPATH = @srcdir@ @@ -145,7 +141,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compile_check_sizeof.m4 \ $(top_srcdir)/m4/curl-confopts.m4 \ $(top_srcdir)/m4/curl-functions.m4 \ $(top_srcdir)/m4/curl-gnutls.m4 \ - $(top_srcdir)/m4/curl-mbedtls.m4 $(top_srcdir)/m4/curl-nss.m4 \ + $(top_srcdir)/m4/curl-mbedtls.m4 \ + $(top_srcdir)/m4/curl-mesalink.m4 $(top_srcdir)/m4/curl-nss.m4 \ $(top_srcdir)/m4/curl-openssl.m4 \ $(top_srcdir)/m4/curl-override.m4 \ $(top_srcdir)/m4/curl-reentrant.m4 \ @@ -239,7 +236,6 @@ CURL_DISABLE_TFTP = @CURL_DISABLE_TFTP@ CURL_LT_SHLIB_VERSIONED_FLAVOUR = @CURL_LT_SHLIB_VERSIONED_FLAVOUR@ CURL_NETWORK_AND_TIME_LIBS = @CURL_NETWORK_AND_TIME_LIBS@ CURL_NETWORK_LIBS = @CURL_NETWORK_LIBS@ -CURL_PLIST_VERSION = @CURL_PLIST_VERSION@ CURL_WITH_MULTI_SSL = @CURL_WITH_MULTI_SSL@ CYGPATH_W = @CYGPATH_W@ DEFAULT_SSL_BACKEND = @DEFAULT_SSL_BACKEND@ @@ -257,7 +253,6 @@ ENABLE_STATIC = @ENABLE_STATIC@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ -FILECMD = @FILECMD@ FISH_FUNCTIONS_DIR = @FISH_FUNCTIONS_DIR@ GCOV = @GCOV@ GREP = @GREP@ @@ -333,7 +328,7 @@ USE_LIBRTMP = @USE_LIBRTMP@ USE_LIBSSH = @USE_LIBSSH@ USE_LIBSSH2 = @USE_LIBSSH2@ USE_MBEDTLS = @USE_MBEDTLS@ -USE_MSH3 = @USE_MSH3@ +USE_MESALINK = @USE_MESALINK@ USE_NGHTTP2 = @USE_NGHTTP2@ USE_NGHTTP3 = @USE_NGHTTP3@ USE_NGTCP2 = @USE_NGTCP2@ @@ -405,6 +400,7 @@ runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ +subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ @@ -466,7 +462,6 @@ DPAGES = \ fail-with-body.d \ fail.d \ false-start.d \ - form-escape.d \ form-string.d \ form.d \ ftp-account.d \ @@ -502,7 +497,6 @@ DPAGES = \ interface.d \ ipv4.d \ ipv6.d \ - json.d \ junk-session-cookies.d \ keepalive-time.d \ key-type.d \ @@ -531,7 +525,6 @@ DPAGES = \ next.d \ no-alpn.d \ no-buffer.d \ - no-clobber.d \ no-keepalive.d \ no-npn.d \ no-progress-meter.d \ @@ -589,14 +582,12 @@ DPAGES = \ quote.d \ random-file.d \ range.d \ - rate.d \ raw.d \ referer.d \ remote-header-name.d \ remote-name-all.d \ remote-name.d \ remote-time.d \ - remove-on-error.d \ request-target.d \ request.d \ resolve.d \ diff --git a/3rdparty/curl-7.84.0/docs/cmdline-opts/Makefile.inc b/3rdparty/curl-7.80.0/docs/cmdline-opts/Makefile.inc similarity index 96% rename from 3rdparty/curl-7.84.0/docs/cmdline-opts/Makefile.inc rename to 3rdparty/curl-7.80.0/docs/cmdline-opts/Makefile.inc index 350fa9fa..506025a7 100644 --- a/3rdparty/curl-7.84.0/docs/cmdline-opts/Makefile.inc +++ b/3rdparty/curl-7.80.0/docs/cmdline-opts/Makefile.inc @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2021, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,8 +18,6 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # -# SPDX-License-Identifier: curl -# ########################################################################### # Shared between Makefile.am and CMakeLists.txt @@ -77,7 +75,6 @@ DPAGES = \ fail-with-body.d \ fail.d \ false-start.d \ - form-escape.d \ form-string.d \ form.d \ ftp-account.d \ @@ -113,7 +110,6 @@ DPAGES = \ interface.d \ ipv4.d \ ipv6.d \ - json.d \ junk-session-cookies.d \ keepalive-time.d \ key-type.d \ @@ -142,7 +138,6 @@ DPAGES = \ next.d \ no-alpn.d \ no-buffer.d \ - no-clobber.d \ no-keepalive.d \ no-npn.d \ no-progress-meter.d \ @@ -200,14 +195,12 @@ DPAGES = \ quote.d \ random-file.d \ range.d \ - rate.d \ raw.d \ referer.d \ remote-header-name.d \ remote-name-all.d \ remote-name.d \ remote-time.d \ - remove-on-error.d \ request-target.d \ request.d \ resolve.d \ diff --git a/3rdparty/curl-7.84.0/docs/cmdline-opts/gen.pl b/3rdparty/curl-7.80.0/docs/cmdline-opts/gen.pl similarity index 90% rename from 3rdparty/curl-7.84.0/docs/cmdline-opts/gen.pl rename to 3rdparty/curl-7.80.0/docs/cmdline-opts/gen.pl index e69dd996..e891f670 100644 --- a/3rdparty/curl-7.84.0/docs/cmdline-opts/gen.pl +++ b/3rdparty/curl-7.80.0/docs/cmdline-opts/gen.pl @@ -6,7 +6,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2021, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -19,8 +19,6 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # -# SPDX-License-Identifier: curl -# ########################################################################### =begin comment @@ -78,7 +76,6 @@ sub manpageify { sub printdesc { my @desc = @_; - my $exam = 0; for my $d (@desc) { if($d =~ /\(Added in ([0-9.]+)\)/i) { my $ver = $1; @@ -92,21 +89,11 @@ sub printdesc { # *italics* $d =~ s/\*([^ ]*)\*/\\fI$1\\fP/g; } - if(!$exam && ($d =~ /^ /)) { - # start of example - $exam = 1; - print ".nf\n"; # no-fill - } - elsif($exam && ($d !~ /^ /)) { - # end of example - $exam = 0; - print ".fi\n"; # fill-in - } # skip lines starting with space (examples) if($d =~ /^[^ ]/) { for my $k (keys %optlong) { my $l = manpageify($k); - $d =~ s/--$k([^a-z0-9_-])(\W)/$l$1$2/; + $d =~ s/--$k([^a-z0-9_-])/$l$1/; } } # quote "bare" minuses in the output @@ -116,9 +103,6 @@ sub printdesc { $d =~ s/(\s*)\'/$1\\(aq/; print $d; } - if($exam) { - print ".fi\n"; # fill-in - } } sub seealso { @@ -197,8 +181,6 @@ sub single { my $requires; my $category; my $seealso; - my $copyright; - my $spdx; my @examples; # there can be more than one my $magic; # cmdline special option my $line; @@ -240,43 +222,25 @@ sub single { elsif(/^Example: *(.*)/i) { push @examples, $1; } - elsif(/^C: (.*)/i) { - $copyright=$1; - } - elsif(/^SPDX-License-Identifier: (.*)/i) { - $spdx=$1; - } elsif(/^Help: *(.*)/i) { ; } elsif(/^---/) { if(!$long) { print STDERR "ERROR: no 'Long:' in $f\n"; - return 1; + exit 1; } if(!$category) { print STDERR "ERROR: no 'Category:' in $f\n"; - return 2; + exit 2; } if(!$examples[0]) { print STDERR "$f:$line:1:ERROR: no 'Example:' present\n"; - return 2; + exit 2; } if(!$added) { print STDERR "$f:$line:1:ERROR: no 'Added:' version present\n"; - return 2; - } - if(!$seealso) { - print STDERR "$f:$line:1:ERROR: no 'See-also:' field present\n"; - return 2; - } - if(!$copyright) { - print STDERR "$f:$line:1:ERROR: no 'C:' field present\n"; - return 2; - } - if(!$spdx) { - print STDERR "$f:$line:1:ERROR: no 'SPDX-License-Identifier:' field present\n"; - return 2; + exit 2; } last; } @@ -340,7 +304,7 @@ sub single { my $i = 0; for my $k (@m) { if(!$helplong{$k}) { - print STDERR "$f:$line:1:WARN: see-also a non-existing option: $k\n"; + print STDERR "WARN: $f see-alsos a non-existing option: $k\n"; } my $l = manpageify($k); my $sep = " and"; @@ -367,8 +331,7 @@ sub single { my $l = manpageify($k); $mstr .= sprintf "%s$l", $mstr?" and ":""; } - push @foot, overrides($standalone, - "This option is mutually exclusive to $mstr. "); + push @foot, overrides($standalone, "This option overrides $mstr. "); } if($examples[0]) { my $s =""; @@ -479,8 +442,6 @@ sub listhelp { * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * - * SPDX-License-Identifier: curl - * ***************************************************************************/ #include "tool_setup.h" #include "tool_help.h" @@ -561,17 +522,17 @@ sub listcats { sub mainpage { my (@files) = @_; - my $ret; # show the page header header("page-header"); # output docs for all options foreach my $f (sort @files) { - $ret += single($f, 0); + if(single($f, 0)) { + print STDERR "Can't read $f?\n"; + } } header("page-footer"); - exit $ret if($ret); } sub showonly { diff --git a/3rdparty/curl-7.84.0/docs/cmdline-opts/page-footer b/3rdparty/curl-7.80.0/docs/cmdline-opts/page-footer similarity index 85% rename from 3rdparty/curl-7.84.0/docs/cmdline-opts/page-footer rename to 3rdparty/curl-7.80.0/docs/cmdline-opts/page-footer index 613a3e8d..a0ce0184 100644 --- a/3rdparty/curl-7.84.0/docs/cmdline-opts/page-footer +++ b/3rdparty/curl-7.80.0/docs/cmdline-opts/page-footer @@ -40,18 +40,6 @@ versions should then be given without enclosing brackets. IPv6 numerical addresses are compared as strings, so they will only match if the representations are the same: "::1" is the same as "::0:1" but they do not match. -.IP "APPDATA " -On Windows, this variable is used when trying to find the home directory. If -the primary home variable are all unset. -.IP "COLUMNS " -If set, the specified number of characters will be used as the terminal width -when the alternative progress-bar is shown. If not set, curl will try to -figure it out using other ways. -.IP "CURL_CA_BUNDLE " -If set, will be used as the \fI--cacert\fP value. -.IP "CURL_HOME " -If set, is the first variable curl checks when trying to find its home -directory. If not set, it continues to check \fBXDG_CONFIG_HOME\fP. .IP "CURL_SSL_BACKEND " If curl was built with support for "MultiSSL", meaning that it has built-in support for more than one TLS backend, this environment variable can be set to @@ -60,35 +48,18 @@ invoked. Setting a name that is not a built-in alternative will make curl stay with the default. SSL backend names (case-insensitive): bearssl, gnutls, gskit, mbedtls, -nss, openssl, rustls, schannel, secure-transport, wolfssl -.IP "HOME " -If set, this is used to find the home directory when that is needed. Like when -looking for the default .curlrc. \fBCURL_HOME\fP and \fBXDG_CONFIG_HOME\fP -have preference. +mesalink, nss, openssl, rustls, schannel, secure-transport, wolfssl .IP "QLOGDIR " If curl was built with HTTP/3 support, setting this environment variable to a local directory will make curl produce qlogs in that directory, using file names named after the destination connection id (in hex). Do note that these files can become rather large. Works with both QUIC backends. -.IP SHELL -Used on VMS when trying to detect if using a DCL or a "unix" shell. -.IP "SSL_CERT_DIR " -If set, will be used as the \fI--capath\fP value. -.IP "SSL_CERT_FILE " -If set, will be used as the \fI--cacert\fP value. .IP "SSLKEYLOGFILE " If you set this environment variable to a file name, curl will store TLS secrets from its connections in that file when invoked to enable you to analyze the TLS traffic in real time using network analyzing tools such as Wireshark. This works with the following TLS backends: OpenSSL, libressl, BoringSSL, GnuTLS, NSS and wolfSSL. -.IP "USERPROFILE " -On Windows, this variable is used when trying to find the home directory. If -the other, primary, variable are all unset. If set, curl will use the path -"$USERPROFILE\\Application Data". -.IP "XDG_CONFIG_HOME " -If \fBCURL_HOME\fP is not set, this variable is checked when looking for a -default .curlrc file. .SH "PROXY PROTOCOL PREFIXES" The proxy string may be specified with a protocol:// prefix to specify alternative proxy protocols. (Added in 7.21.7) @@ -113,8 +84,6 @@ Makes it the equivalent of --socks5-hostname There are a bunch of different error codes and their corresponding error messages that may appear under error conditions. At the time of this writing, the exit codes are: -.IP 0 -Success. The operation completed successfully according to the instructions. .IP 1 Unsupported protocol. This build of curl has no support for this protocol. .IP 2 @@ -124,7 +93,7 @@ URL malformed. The syntax was not correct. .IP 4 A feature or option that was needed to perform the desired request was not enabled or was explicitly disabled at build-time. To make curl able to do -this, you probably need another build of libcurl. +this, you probably need another build of libcurl! .IP 5 Could not resolve proxy. The given proxy host could not be resolved. .IP 6 @@ -166,7 +135,7 @@ failed. .IP 21 FTP quote error. A quote command returned error from the server. .IP 22 -HTTP page not retrieved. The requested URL was not found or returned another +HTTP page not retrieved. The requested url was not found or returned another error with the HTTP error code being 400 or above. This return code only appears if --fail is used. .IP 23 @@ -310,9 +279,6 @@ is the protocol used for HTTP/3 transfers. .IP XX More error codes will appear here in future releases. The existing ones are meant to never change. -.SH BUGS -If you experience any problems with curl, submit an issue in the project's bug -tracker on GitHub: https://github.com/curl/curl/issues .SH AUTHORS / CONTRIBUTORS Daniel Stenberg is the main author, but the whole list of contributors is found in the separate THANKS file. diff --git a/3rdparty/curl-7.84.0/docs/cmdline-opts/page-header b/3rdparty/curl-7.80.0/docs/cmdline-opts/page-header similarity index 95% rename from 3rdparty/curl-7.84.0/docs/cmdline-opts/page-header rename to 3rdparty/curl-7.80.0/docs/cmdline-opts/page-header index 84bd39d0..db579309 100644 --- a/3rdparty/curl-7.84.0/docs/cmdline-opts/page-header +++ b/3rdparty/curl-7.80.0/docs/cmdline-opts/page-header @@ -5,7 +5,7 @@ .\" * | (__| |_| | _ <| |___ .\" * \___|\___/|_| \_\_____| .\" * -.\" * Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +.\" * Copyright (C) 1998 - 2021, Daniel Stenberg, , et al. .\" * .\" * This software is licensed as described in the file COPYING, which .\" * you should have received as part of this distribution. The terms @@ -18,8 +18,6 @@ .\" * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY .\" * KIND, either express or implied. .\" * -.\" * SPDX-License-Identifier: curl -.\" * .\" ************************************************************************** .\" .\" DO NOT EDIT. Generated by the curl project gen.pl man page generator. @@ -39,7 +37,7 @@ interaction. curl offers a busload of useful tricks like proxy support, user authentication, FTP upload, HTTP post, SSL connections, cookies, file transfer resume and more. As you will see below, the number of features will make your -head spin. +head spin! curl is powered by libcurl for all transfer-related features. See *libcurl(3)* for details. @@ -92,8 +90,8 @@ based on often-used host name prefixes. For example, for host names starting with "ftp." curl will assume you want to speak FTP. curl will do its best to use what you pass to it as a URL. It is not trying to -validate it as a syntactically correct URL by any means but is fairly liberal -with what it accepts. +validate it as a syntactically correct URL by any means but is instead +**very** liberal with what it accepts. curl will attempt to re-use connections for multiple file transfers, so that getting many files from the same server will not do multiple connects / @@ -194,6 +192,6 @@ immediately next to each other, like for example you can specify all the options -O, -L and -v at once as -OLv. In general, all boolean options are enabled with --**option** and yet again -disabled with --**no-**option. That is, you use the same option name but -prefix it with "no-". However, in this list we mostly only list and show the ---option version of them. +disabled with --**no-**option. That is, you use the exact same option name +but prefix it with "no-". However, in this list we mostly only list and show +the --option version of them. diff --git a/3rdparty/curl-7.84.0/docs/curl-config.1 b/3rdparty/curl-7.80.0/docs/curl-config.1 similarity index 96% rename from 3rdparty/curl-7.84.0/docs/curl-config.1 rename to 3rdparty/curl-7.80.0/docs/curl-config.1 index 39868d94..bcaa5c15 100644 --- a/3rdparty/curl-7.84.0/docs/curl-config.1 +++ b/3rdparty/curl-7.80.0/docs/curl-config.1 @@ -5,7 +5,7 @@ .\" * | (__| |_| | _ <| |___ .\" * \___|\___/|_| \_\_____| .\" * -.\" * Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +.\" * Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. .\" * .\" * This software is licensed as described in the file COPYING, which .\" * you should have received as part of this distribution. The terms @@ -18,11 +18,9 @@ .\" * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY .\" * KIND, either express or implied. .\" * -.\" * SPDX-License-Identifier: curl -.\" * .\" ************************************************************************** .\" -.TH curl-config 1 "May 17, 2022" "Curl 7.84.0" "curl-config manual" +.TH curl-config 1 "November 04, 2020" "Curl 7.80.0" "curl-config manual" .SH NAME curl-config \- Get information about a libcurl installation diff --git a/3rdparty/curl-7.84.0/docs/curl.1 b/3rdparty/curl-7.80.0/docs/curl.1 similarity index 79% rename from 3rdparty/curl-7.84.0/docs/curl.1 rename to 3rdparty/curl-7.80.0/docs/curl.1 index 6eb38961..2e69b9f4 100644 --- a/3rdparty/curl-7.84.0/docs/curl.1 +++ b/3rdparty/curl-7.80.0/docs/curl.1 @@ -5,7 +5,7 @@ .\" * | (__| |_| | _ <| |___ .\" * \___|\___/|_| \_\_____| .\" * -.\" * Copyright (C) 1998 \- 2022, Daniel Stenberg, , et al. +.\" * Copyright (C) 1998 \- 2021, Daniel Stenberg, , et al. .\" * .\" * This software is licensed as described in the file COPYING, which .\" * you should have received as part of this distribution. The terms @@ -18,13 +18,11 @@ .\" * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY .\" * KIND, either express or implied. .\" * -.\" * SPDX-License-Identifier: curl -.\" * .\" ************************************************************************** .\" .\" DO NOT EDIT. Generated by the curl project gen.pl man page generator. .\" -.TH curl 1 "June 26 2022" "curl 7.84.0" "curl Manual" +.TH curl 1 "November 10 2021" "curl 7.80.0" "curl Manual" .SH NAME curl \- transfer a URL .SH SYNOPSIS @@ -39,7 +37,7 @@ interaction. curl offers a busload of useful tricks like proxy support, user authentication, FTP upload, HTTP post, SSL connections, cookies, file transfer resume and more. As you will see below, the number of features will make your -head spin. +head spin! curl is powered by libcurl for all transfer-related features. See \fIlibcurl(3)\fP for details. @@ -50,30 +48,20 @@ RFC 3986. You can specify multiple URLs or parts of URLs by writing part sets within braces and quoting the URL as in: -.nf "http://site.{one,two,three}.com" -.fi or you can get sequences of alphanumeric series by using [] as in: -.nf "ftp://ftp.example.com/file[1-100].txt" -.fi -.nf "ftp://ftp.example.com/file[001-100].txt" (with leading zeros) -.fi -.nf "ftp://ftp.example.com/file[a-z].txt" -.fi Nested sequences are not supported, but you can use several ones next to each other: -.nf "http://example.com/archive[1996-1999]/vol[1-4]/part{a,b,c}.html" -.fi You can specify any amount of URLs on the command line. They will be fetched in a sequential manner in the specified order. You can specify command line @@ -82,13 +70,9 @@ options and URLs mixed and in any order on the command line. You can specify a step counter for the ranges to get every Nth number or letter: -.nf "http://example.com/file[1-100:10].txt" -.fi -.nf "http://example.com/file[a-z:2].txt" -.fi When using [] or {} sequences when invoked from a command line prompt, you probably have to put the full URL within double quotes to avoid the shell from @@ -98,9 +82,7 @@ for example \(aq&', '?' and '*'. Provide the IPv6 zone index in the URL with an escaped percentage sign and the interface name. Like in -.nf "http://[fe80::3%25eth0]/" -.fi If you specify URL without protocol:// prefix, curl will attempt to guess what protocol you might want. It will then default to HTTP but try other protocols @@ -108,8 +90,8 @@ based on often-used host name prefixes. For example, for host names starting with "ftp." curl will assume you want to speak FTP. curl will do its best to use what you pass to it as a URL. It is not trying to -validate it as a syntactically correct URL by any means but is fairly liberal -with what it accepts. +validate it as a syntactically correct URL by any means but is instead +\fBvery\fP liberal with what it accepts. curl will attempt to re-use connections for multiple file transfers, so that getting many files from the same server will not do multiple connects / @@ -118,8 +100,8 @@ specified on a single command line and cannot be used between separate curl invocations. .SH OUTPUT If not told otherwise, curl writes the received data to stdout. It can be -instructed to instead save that data into a local file, using the \-\-output or -\-\-remote-name options. If curl is given multiple URLs to transfer on the +instructed to instead save that data into a local file, using the \fI\-o, \-\-output\fP or +\fI\-O, \-\-remote-name\fP options. If curl is given multiple URLs to transfer on the command line, it similarly needs multiple options for where to save them. curl does not parse or otherwise "understand" the content it gets or writes as @@ -187,22 +169,22 @@ do an operation and it is about to write data to the terminal, it mixing progress meter and response data. If you want a progress meter for HTTP POST or PUT requests, you need to -redirect the response output to a file, using shell redirect (>), \-\-output or +redirect the response output to a file, using shell redirect (>), \fI\-o, \-\-output\fP or similar. This does not apply to FTP upload as that operation does not spit out any response data to the terminal. -If you prefer a progress "bar" instead of the regular meter, \-\-progress-bar is +If you prefer a progress "bar" instead of the regular meter, \fI\-#, \-\-progress-bar\fP is your friend. You can also disable the progress meter completely with the -\-\-silent option. +\fI\-s, \-\-silent\fP option. .SH OPTIONS Options start with one or two dashes. Many of the options require an additional value next to them. The short "single-dash" form of the options, \-d for example, may be used with or without a space between it and its value, although a space is a recommended -separator. The long "double-dash" form, \-\-data for example, requires a space +separator. The long "double-dash" form, \fI\-d, \-\-data\fP for example, requires a space between it and its value. Short version options that do not need any additional values can be used @@ -210,9 +192,9 @@ immediately next to each other, like for example you can specify all the options \-O, \-L and \-v at once as \-OLv. In general, all boolean options are enabled with \-\-\fBoption\fP and yet again -disabled with \-\-\fBno-\fPoption. That is, you use the same option name but -prefix it with "no-". However, in this list we mostly only list and show the -\-\-option version of them. +disabled with \-\-\fBno-\fPoption. That is, you use the exact same option name +but prefix it with "no-". However, in this list we mostly only list and show +the \-\-option version of them. .IP "\-\-abstract-unix-socket " (HTTP) Connect through an abstract Unix domain socket, instead of using the network. Note: netstat shows the path of an abstract socket prefixed with \(aq@', however @@ -223,7 +205,7 @@ Example: curl --abstract-unix-socket socketpath https://example.com .fi -See also \fI--unix-socket\fP. Added in 7.53.0. +Added in 7.53.0. .IP "\-\-alt-svc " (HTTPS) This option enables the alt-svc parser in curl. If the file name points to an existing alt-svc cache file, that will be used. After a completed transfer, @@ -240,7 +222,7 @@ Example: curl --alt-svc svc.txt https://example.com .fi -See also \fI--resolve\fP and \fI--connect-to\fP. Added in 7.64.1. +Added in 7.64.1. .IP "\-\-anyauth" (HTTP) Tells curl to figure out authentication method by itself, and use the most secure one the remote site claims to support. This is done by first doing a @@ -248,7 +230,7 @@ request and checking the response-headers, thus possibly inducing an extra network round-trip. This is used instead of setting a specific authentication method, which you can do with \fI\-\-basic\fP, \fI\-\-digest\fP, \fI\-\-ntlm\fP, and \fI\-\-negotiate\fP. -Using \-\-anyauth is not recommended if you do uploads from stdin, since it may +Using \fI\-\-anyauth\fP is not recommended if you do uploads from stdin, since it may require data to be sent twice and then the client must be able to rewind. If the need should arise when uploading from stdin, the upload operation will fail. @@ -263,15 +245,13 @@ Example: See also \fI--proxy-anyauth\fP, \fI--basic\fP and \fI--digest\fP. .IP "\-a, \-\-append" (FTP SFTP) When used in an upload, this makes curl append to the target file instead of -overwriting it. If the remote file does not exist, it will be created. Note +overwriting it. If the remote file does not exist, it will be created. Note that this flag is ignored by some SFTP servers (including OpenSSH). Example: .nf curl --upload-file local --append ftp://example.com/ .fi - -See also \fI-r, --range\fP and \fI-C, --continue-at\fP. .IP "\-\-aws-sigv4 " Use AWS V4 signature authentication in the transfer. @@ -290,7 +270,7 @@ Example: curl --aws-sigv4 "aws:amz:east-2:es" --user "key:secret" https://example.com .fi -See also \fI--basic\fP and \fI-u, --user\fP. Added in 7.75.0. +Added in 7.75.0. .IP "\-\-basic" (HTTP) Tells curl to use HTTP Basic authentication with the remote host. This is the default and this option is usually pointless, unless you use it to override a @@ -339,16 +319,14 @@ Example: .nf curl --cacert CA-file.txt https://example.com .fi - -See also \fI--capath\fP and \fI-k, --insecure\fP. .IP "\-\-capath " (TLS) Tells curl to use the specified certificate directory to verify the peer. Multiple paths can be provided by separating them with ":" (e.g. \&"path1:path2:path3"). The certificates must be in PEM format, and if curl is built against OpenSSL, the directory must have been processed using the -c_rehash utility supplied with OpenSSL. Using \-\-capath can allow +c_rehash utility supplied with OpenSSL. Using \fI\-\-capath\fP can allow OpenSSL-powered curl to make SSL-connections much more efficiently than using -\-\-cacert if the \-\-cacert file contains many CA certificates. +\fI\-\-cacert\fP if the \-\-cacert file contains many CA certificates. If this option is set, the default capath value will be ignored, and if it is used several times, the last one will be used. @@ -357,8 +335,6 @@ Example: .nf curl --capath /local/directory https://example.com .fi - -See also \fI--cacert\fP and \fI-k, --insecure\fP. .IP "\-\-cert-status" (TLS) Tells curl to verify the status of the server certificate by using the Certificate Status Request (aka. OCSP stapling) TLS extension. @@ -374,14 +350,10 @@ Example: curl --cert-status https://example.com .fi -See also \fI--pinnedpubkey\fP. Added in 7.41.0. +Added in 7.41.0. .IP "\-\-cert-type " (TLS) Tells curl what type the provided client certificate is using. PEM, DER, ENG -and P12 are recognized types. - -The default type depends on the TLS backend and is usually PEM, however for -Secure Transport and Schannel it is P12. If \-\-cert is a pkcs11: URI then ENG is -the default type. +and P12 are recognized types. If not specified, PEM is assumed. If this option is used several times, the last one will be used. @@ -395,9 +367,9 @@ See also \fI-E, --cert\fP, \fI--key\fP and \fI--key-type\fP. (TLS) Tells curl to use the specified client certificate file when getting a file with HTTPS, FTPS or another SSL-based protocol. The certificate must be in PKCS#12 format if using Secure Transport, or PEM format if using any other -engine. If the optional password is not specified, it will be queried for on +engine. If the optional password is not specified, it will be queried for on the terminal. Note that this option assumes a \&"certificate" file that is the -private key and the client certificate concatenated! See \-\-cert and \-\-key to +private key and the client certificate concatenated! See \fI\-E, \-\-cert\fP and \fI\-\-key\fP to specify them independently. If curl is built against the NSS SSL library then this option can tell @@ -405,16 +377,16 @@ curl the nickname of the certificate to use within the NSS database defined by the environment variable SSL_DIR (or by default /etc/pki/nssdb). If the NSS PEM PKCS#11 module (libnsspem.so) is available then PEM files may be loaded. If you want to use a file from the current directory, please precede -it with "./" prefix, in order to avoid confusion with a nickname. If the +it with "./" prefix, in order to avoid confusion with a nickname. If the nickname contains ":", it needs to be preceded by "\\" so that it is not -recognized as password delimiter. If the nickname contains "\\", it needs to +recognized as password delimiter. If the nickname contains "\\", it needs to be escaped as "\\\\" so that it is not recognized as an escape character. If curl is built against OpenSSL library, and the engine pkcs11 is available, then a PKCS#11 URI (RFC 7512) can be used to specify a certificate located in a PKCS#11 device. A string beginning with "pkcs11:" will be interpreted as a -PKCS#11 URI. If a PKCS#11 URI is provided, then the \-\-engine option will be set -as "pkcs11" if none was provided and the \-\-cert-type option will be set as +PKCS#11 URI. If a PKCS#11 URI is provided, then the \fI\-\-engine\fP option will be set +as "pkcs11" if none was provided and the \fI\-\-cert-type\fP option will be set as "ENG" if none was provided. (iOS and macOS only) If curl is built against Secure Transport, then the @@ -446,9 +418,7 @@ See also \fI--cert-type\fP, \fI--key\fP and \fI--key-type\fP. (TLS) Specifies which ciphers to use in the connection. The list of ciphers must specify valid ciphers. Read up on SSL cipher list details on this URL: -.nf https://curl.se/docs/ssl-ciphers.html -.fi If this option is used several times, the last one will be used. @@ -456,8 +426,6 @@ Example: .nf curl --ciphers ECDHE-ECDSA-AES256-CCM8 https://example.com .fi - -See also \fI--tlsv1.3\fP. .IP "\-\-compressed-ssh" (SCP SFTP) Enables built-in SSH compression. This is a request, not an order; the server may or may not do it. @@ -467,7 +435,7 @@ Example: curl --compressed-ssh sftp://example.com/ .fi -See also \fI--compressed\fP. Added in 7.56.0. +Added in 7.56.0. .IP "\-\-compressed" (HTTP) Request a compressed response using one of the algorithms curl supports, and automatically decompress the content. Headers are not modified. @@ -480,8 +448,6 @@ Example: .nf curl --compressed https://example.com .fi - -See also \fI--compressed-ssh\fP. .IP "\-K, \-\-config " Specify a text file to read curl arguments from. The command line arguments found in the text file will be used as if they were provided on the command @@ -504,53 +470,47 @@ will be treated as a comment. Only write one option per physical line in the config file. -Specify the filename to \-\-config as \(aq-' to make curl read the file from stdin. +Specify the filename to \fI\-K, \-\-config\fP as \(aq-' to make curl read the file from stdin. Note that to be able to specify a URL in the config file, you need to specify -it using the \-\-url option, and not by simply writing the URL on its own +it using the \fI\-\-url\fP option, and not by simply writing the URL on its own line. So, it could look similar to this: url = "https://curl.se/docs/" -.nf - # \-\-\- Example file \-\-\- - # this is a comment - url = "example.com" - output = "curlhere.html" - user-agent = "superagent/1.0" -.fi - -.nf - # and fetch another URL too - url = "example.com/docs/manpage.html" - \-O - referer = "http://nowhereatall.example.com/" - # \-\-\- End of example file \-\-\- -.fi - -When curl is invoked, it (unless \-\-disable is used) checks for a default -config file and uses it if found, even when \-\-config is used. The default +When curl is invoked, it (unless \fI\-q, \-\-disable\fP is used) checks for a default +config file and uses it if found, even when this option is used. The default config file is checked for in the following places in this order: -1) "$CURL_HOME/.curlrc" +1) Use the CURL_HOME environment variable if set -2) "$XDG_CONFIG_HOME/.curlrc" (Added in 7.73.0) +2) Use the XDG_CONFIG_HOME environment variable if set (Added in 7.73.0) -3) "$HOME/.curlrc" +3) Use the HOME environment variable if set -4) Windows: "%USERPROFILE%\\.curlrc" +4) Non-windows: use getpwuid to find the home directory -5) Windows: "%APPDATA%\\.curlrc" +5) Windows: use APPDATA if set -6) Windows: "%USERPROFILE%\\Application Data\\.curlrc" +6) Windows: use "USERPROFILE\\Application Data" if set -7) Non-Windows: use getpwuid to find the home directory +7) On windows, if there is no .curlrc file in the home dir, it checks for one +in the same dir the curl executable is placed. On Unix-like systems, it will +simply try to load .curlrc from the determined home dir. -8) On Windows, if it finds no .curlrc file in the sequence described above, it -checks for one in the same dir the curl executable is placed. +.nf +# \-\-\- Example file \-\-\- +# this is a comment +url = "example.com" +output = "curlhere.html" +user-agent = "superagent/1.0" -On Windows two filenames are checked per location: .curlrc and _curlrc, -preferring the former. Older versions on Windows checked for _curlrc only. +# and fetch another URL too +url = "example.com/docs/manpage.html" +\-O +referer = "http://nowhereatall.example.com/" +# \-\-\- End of example file \-\-\- +.fi This option can be used multiple times to load multiple config files. @@ -558,8 +518,6 @@ Example: .nf curl --config file.txt https://example.com .fi - -See also \fI-q, --disable\fP. .IP "\-\-connect-timeout " Maximum time in seconds that you allow curl\(aqs connection to take. This only limits the connection phase, so if curl connects within the given period it @@ -601,7 +559,7 @@ See also \fI--resolve\fP and \fI-H, --header\fP. Added in 7.49.0. .IP "\-C, \-\-continue-at " Continue/Resume a previous file transfer at the given offset. The given offset is the exact number of bytes that will be skipped, counting from the beginning -of the source file before it is transferred to the destination. If used with +of the source file before it is transferred to the destination. If used with uploads, the FTP server command SIZE will not be used by curl. Use "-C \-" to tell curl to automatically find out where/how to resume the @@ -625,11 +583,11 @@ you set the file name to a single dash, "-", the cookies will be written to stdout. This command line option will activate the cookie engine that makes curl -record and use cookies. Another way to activate it is to use the \-\-cookie +record and use cookies. Another way to activate it is to use the \fI\-b, \-\-cookie\fP option. If the cookie jar cannot be created or written to, the whole curl operation -will not fail or even report an error clearly. Using \-\-verbose will get a +will not fail or even report an error clearly. Using \fI\-v, \-\-verbose\fP will get a warning displayed, but that is the only visible feedback you get about this possibly lethal situation. @@ -641,28 +599,23 @@ Examples: curl -c store-here.txt https://example.com curl -c store-here.txt -b read-these https://example.com .fi - -See also \fI-b, --cookie\fP. .IP "\-b, \-\-cookie " -(HTTP) Pass the data to the HTTP server in the Cookie header. It is supposedly the -data previously received from the server in a "Set-Cookie:" line. The data -should be in the format "NAME1=VALUE1; NAME2=VALUE2". This makes curl use the -cookie header with this content explicitly in all outgoing request(s). If -multiple requests are done due to authentication, followed redirects or -similar, they will all get this cookie passed on. +(HTTP) Pass the data to the HTTP server in the Cookie header. It is supposedly +the data previously received from the server in a "Set-Cookie:" line. The +data should be in the format "NAME1=VALUE1; NAME2=VALUE2". If no \(aq=' symbol is used in the argument, it is instead treated as a filename to read previously stored cookie from. This option also activates the cookie engine which will make curl record incoming cookies, which may be handy if -you are using this in combination with the \-\-location option or do multiple URL +you are using this in combination with the \fI\-L, \-\-location\fP option or do multiple URL transfers on the same invoke. If the file name is exactly a minus ("-"), curl will instead read the contents from stdin. The file format of the file to read cookies from should be plain HTTP headers (Set-Cookie style) or the Netscape/Mozilla cookie file format. -The file specified with \-\-cookie is only used as input. No cookies will be -written to the file. To store cookies, use the \-\-cookie-jar option. +The file specified with \fI\-b, \-\-cookie\fP is only used as input. No cookies will be +written to the file. To store cookies, use the \fI\-c, \-\-cookie-jar\fP option. If you use the Set-Cookie file format and do not specify a domain then the cookie is not sent since the domain will never match. To address this, set a @@ -672,7 +625,7 @@ use the Netscape format. This option can be used multiple times. Users often want to both read cookies from a file and write updated cookies -back to a file, so using both \-\-cookie and \-\-cookie-jar in the same command +back to a file, so using both \fI\-b, \-\-cookie\fP and \fI\-c, \-\-cookie-jar\fP in the same command line is common. Examples: @@ -680,12 +633,10 @@ Examples: curl -b cookiefile https://example.com curl -b cookiefile -c cookiefile https://example.com .fi - -See also \fI-c, --cookie-jar\fP and \fI-j, --junk-session-cookies\fP. .IP "\-\-create-dirs" -When used in conjunction with the \-\-output option, curl will create the +When used in conjunction with the \fI\-o, \-\-output\fP option, curl will create the necessary local directory hierarchy as needed. This option creates the -directories mentioned with the \-\-output option, nothing else. If the \-\-output +directories mentioned with the \fI\-o, \-\-output\fP option, nothing else. If the \-\-output file name uses no directory, or if the directories it mentions already exist, no directories will be created. @@ -697,8 +648,6 @@ Example: .nf curl --create-dirs --output local/dir/file https://example.com .fi - -See also \fI--ftp-create-dirs\fP and \fI--output-dir\fP. .IP "\-\-create-file-mode " (SFTP SCP FILE) When curl is used to create files remotely using one of the supported protocols, this option allows the user to set which \(aqmode' to set on the file @@ -723,8 +672,6 @@ Example: .nf curl --crlf -T file ftp://example.com/ .fi - -See also \fI-B, --use-ascii\fP. .IP "\-\-crlfile " (TLS) Provide a file using PEM format with a Certificate Revocation List that may specify peer certificates that are to be considered revoked. @@ -735,16 +682,14 @@ Example: .nf curl --crlfile rejects.txt https://example.com .fi - -See also \fI--cacert\fP and \fI--capath\fP. .IP "\-\-curves " (TLS) Tells curl to request specific curves to use during SSL session establishment according to RFC 8422, 5.1. Multiple algorithms can be provided by separating them with ":" (e.g. "X25519:P-521"). The parameter is available identically in the "openssl s_client/s_server" utilities. -\-\-curves allows a OpenSSL powered curl to make SSL-connections with exactly -the (EC) curve requested by the client, avoiding nontransparent client/server +\fI\-\-curves\fP allows a OpenSSL powered curl to make SSL-connections with exactly +the (EC) curve requested by the client, avoiding intransparent client/server negotiations. If this option is set, the default curves list built into openssl will be @@ -755,7 +700,7 @@ Example: curl --curves X25519 https://example.com .fi -See also \fI--ciphers\fP. Added in 7.73.0. +Added in 7.73.0. .IP "\-\-data-ascii " (HTTP) This is just an alias for \fI\-d, \-\-data\fP. @@ -763,16 +708,14 @@ Example: .nf curl --data-ascii @file https://example.com .fi - -See also \fI--data-binary\fP, \fI--data-raw\fP and \fI--data-urlencode\fP. .IP "\-\-data-binary " (HTTP) This posts data exactly as specified with no extra processing whatsoever. -If you start the data with the letter @, the rest should be a filename. Data -is posted in a similar manner as \-\-data does, except that newlines and +If you start the data with the letter @, the rest should be a filename. Data +is posted in a similar manner as \fI\-d, \-\-data\fP does, except that newlines and carriage returns are preserved and conversions are never done. -Like \-\-data the default content-type sent to the server is +Like \fI\-d, \-\-data\fP the default content-type sent to the server is application/x-www-form-urlencoded. If you want the data to be treated as arbitrary binary data by the server then set the content-type to octet-stream: \-H "Content-Type: application/octet-stream". @@ -784,10 +727,8 @@ Example: .nf curl --data-binary @filename https://example.com .fi - -See also \fI--data-ascii\fP. .IP "\-\-data-raw " -(HTTP) This posts data similarly to \-\-data but without the special +(HTTP) This posts data similarly to \fI\-d, \-\-data\fP but without the special interpretation of the @ character. Examples: @@ -798,7 +739,7 @@ Examples: See also \fI-d, --data\fP. Added in 7.43.0. .IP "\-\-data-urlencode " -(HTTP) This posts data, similar to the other \-\-data options with the exception +(HTTP) This posts data, similar to the other \fI\-d, \-\-data\fP options with the exception that this performs URL-encoding. To be CGI-compliant, the part should begin with a \fIname\fP followed @@ -838,24 +779,24 @@ See also \fI-d, --data\fP and \fI--data-raw\fP. (HTTP MQTT) Sends the specified data in a POST request to the HTTP server, in the same way that a browser does when a user has filled in an HTML form and presses the submit button. This will cause curl to pass the data to the server using the -content-type application/x-www-form-urlencoded. Compare to \fI\-F, \-\-form\fP. +content-type application/x-www-form-urlencoded. Compare to \fI\-F, \-\-form\fP. -\-\-data-raw is almost the same but does not have a special interpretation of +\fI\-\-data-raw\fP is almost the same but does not have a special interpretation of the @ character. To post data purely binary, you should instead use the -\-\-data-binary option. To URL-encode the value of a form field you may use +\fI\-\-data-binary\fP option. To URL-encode the value of a form field you may use \fI\-\-data-urlencode\fP. If any of these options is used more than once on the same command line, the -data pieces specified will be merged with a separating &-symbol. Thus, using -\&\(aq-d name=daniel \-d skill=lousy' would generate a post chunk that looks like -\&\(aqname=daniel&skill=lousy'. +data pieces specified will be merged together with a separating +&-symbol. Thus, using \(aq-d name=daniel \-d skill=lousy' would generate a post +chunk that looks like \&\(aqname=daniel&skill=lousy'. If you start the data with the letter @, the rest should be a file name to read the data from, or \- if you want curl to read the data from stdin. Posting data from a file named \&\(aqfoobar' would thus be done with \fI\-d, \-\-data\fP @foobar. When -\-\-data is told to read from a file like that, carriage returns and newlines +\fI\-d, \-\-data\fP is told to read from a file like that, carriage returns and newlines will be stripped out. If you do not want the @ character to have a special -interpretation use \-\-data-raw instead. +interpretation use \fI\-\-data-raw\fP instead. Examples: .nf @@ -864,7 +805,7 @@ Examples: curl -d @filename https://example.com .fi -See also \fI--data-binary\fP, \fI--data-urlencode\fP and \fI--data-raw\fP. This option is mutually exclusive to \fI-F, --form\fP and \fI-I, --head\fP and \fI-T, --upload-file\fP. +See also \fI--data-binary\fP, \fI--data-urlencode\fP and \fI--data-raw\fP. This option overrides \fI-F, --form\fP and \fI-I, --head\fP and \fI-T, --upload-file\fP. .IP "\-\-delegation " (GSS/kerberos) Set LEVEL to tell the server what it is allowed to delegate when it comes to user credentials. @@ -884,12 +825,10 @@ Example: .nf curl --delegation "none" https://example.com .fi - -See also \fI-k, --insecure\fP and \fI--ssl\fP. .IP "\-\-digest" (HTTP) Enables HTTP Digest authentication. This is an authentication scheme that prevents the password from being sent over the wire in clear text. Use this in -combination with the normal \-\-user option to set user name and password. +combination with the normal \fI\-u, \-\-user\fP option to set user name and password. If this option is used several times, only the first one is used. @@ -898,7 +837,7 @@ Example: curl -u name:password --digest https://example.com .fi -See also \fI-u, --user\fP, \fI--proxy-digest\fP and \fI--anyauth\fP. This option is mutually exclusive to \fI--basic\fP and \fI--ntlm\fP and \fI--negotiate\fP. +See also \fI-u, --user\fP, \fI--proxy-digest\fP and \fI--anyauth\fP. This option overrides \fI--basic\fP and \fI--ntlm\fP and \fI--negotiate\fP. .IP "\-\-disable-eprt" (FTP) Tell curl to disable the use of the EPRT and LPRT commands when doing active FTP transfers. Curl will normally always first attempt to use EPRT, then LPRT @@ -914,14 +853,12 @@ If the server is accessed using IPv6, this option will have no effect as EPRT is necessary then. Disabling EPRT only changes the active behavior. If you want to switch to -passive mode you need to not use \-\-ftp-port or force it with \fI\-\-ftp-pasv\fP. +passive mode you need to not use \fI\-P, \-\-ftp-port\fP or force it with \fI\-\-ftp-pasv\fP. Example: .nf curl --disable-eprt ftp://example.com/ .fi - -See also \fI--disable-epsv\fP and \fI-P, --ftp-port\fP. .IP "\-\-disable-epsv" (FTP) Tell curl to disable the use of the EPSV command when doing passive FTP transfers. Curl will normally always first attempt to use EPSV before @@ -940,22 +877,18 @@ Example: .nf curl --disable-epsv ftp://example.com/ .fi - -See also \fI--disable-eprt\fP and \fI-P, --ftp-port\fP. .IP "\-q, \-\-disable" If used as the first parameter on the command line, the \fIcurlrc\fP config -file will not be read and used. See the \-\-config for details on the default +file will not be read and used. See the \fI\-K, \-\-config\fP for details on the default config file search path. Example: .nf curl -q https://example.com .fi - -See also \fI-K, --config\fP. .IP "\-\-disallow-username-in-url" -(HTTP) This tells curl to exit if passed a URL containing a username. This is probably -most useful when the URL is being provided at runtime or similar. +(HTTP) This tells curl to exit if passed a url containing a username. This is probably +most useful when the URL is being provided at run-time or similar. Example: .nf @@ -1013,33 +946,33 @@ Example: curl --dns-servers 192.168.0.1,192.168.0.2 https://example.com .fi -See also \fI--dns-interface\fP and \fI--dns-ipv4-addr\fP. \fI--dns-servers\fP requires that the underlying libcurl was built to support c-ares. Added in 7.33.0. +\fI--dns-servers\fP requires that the underlying libcurl was built to support c-ares. Added in 7.33.0. .IP "\-\-doh-cert-status" -Same as \-\-cert-status but used for DoH (DNS-over-HTTPS). +(all) Same as \fI\-\-cert-status\fP but used for DoH (DNS-over-HTTPS). Example: .nf curl --doh-cert-status --doh-url https://doh.example https://example.com .fi -See also \fI--doh-insecure\fP. Added in 7.76.0. +Added in 7.76.0. .IP "\-\-doh-insecure" -Same as \-\-insecure but used for DoH (DNS-over-HTTPS). +(all) Same as \fI\-k, \-\-insecure\fP but used for DoH (DNS-over-HTTPS). Example: .nf curl --doh-insecure --doh-url https://doh.example https://example.com .fi -See also \fI--doh-url\fP. Added in 7.76.0. +Added in 7.76.0. .IP "\-\-doh-url " -Specifies which DNS-over-HTTPS (DoH) server to use to resolve hostnames, +(all) Specifies which DNS-over-HTTPS (DoH) server to use to resolve hostnames, instead of using the default name resolver mechanism. The URL must be HTTPS. Some SSL options that you set for your transfer will apply to DoH since the name lookups take place over SSL. However, the certificate verification settings are not inherited and can be controlled separately via -\-\-doh-insecure and \fI\-\-doh-cert-status\fP. +\fI\-\-doh-insecure\fP and \fI\-\-doh-cert-status\fP. If this option is used several times, the last one will be used. @@ -1048,7 +981,7 @@ Example: curl --doh-url https://doh.example https://example.com .fi -See also \fI--doh-insecure\fP. Added in 7.62.0. +Added in 7.62.0. .IP "\-D, \-\-dump-header " (HTTP FTP) Write the received protocol headers to the specified file. If no headers are received, the use of this option will create an empty file. @@ -1065,10 +998,7 @@ Example: See also \fI-o, --output\fP. .IP "\-\-egd-file " -(TLS) Deprecated option. This option is ignored by curl since 7.84.0. Prior to that -it only had an effect on curl if built to use old versions of OpenSSL. - -Specify the path name to the Entropy Gathering Daemon socket. The socket is +(TLS) Specify the path name to the Entropy Gathering Daemon socket. The socket is used to seed the random engine for SSL connections. Example: @@ -1078,16 +1008,14 @@ Example: See also \fI--random-file\fP. .IP "\-\-engine " -(TLS) Select the OpenSSL crypto engine to use for cipher operations. Use \-\-engine +(TLS) Select the OpenSSL crypto engine to use for cipher operations. Use \fI\-\-engine\fP list to print a list of build-time supported engines. Note that not all (and -possibly none) of the engines may be available at runtime. +possibly none) of the engines may be available at run-time. Example: .nf curl --engine flavor https://example.com .fi - -See also \fI--ciphers\fP and \fI--curves\fP. .IP "\-\-etag-compare " (HTTP) This option makes a conditional HTTP request for the specific ETag read from the given file by sending a custom If-None-Match header using the @@ -1097,7 +1025,7 @@ For correct results, make sure that the specified file contains only a single line with the desired ETag. An empty file is parsed as an empty ETag. -Use the option \-\-etag-save to first save the ETag from a response, and +Use the option \fI\-\-etag-save\fP to first save the ETag from a response, and then use this option to compare against the saved ETag in a subsequent request. @@ -1106,7 +1034,7 @@ Example: curl --etag-compare etag.txt https://example.com .fi -See also \fI--etag-save\fP and \fI-z, --time-cond\fP. Added in 7.68.0. +Added in 7.68.0. .IP "\-\-etag-save " (HTTP) This option saves an HTTP ETag to the specified file. An ETag is a caching related header, usually returned in a response. @@ -1118,7 +1046,7 @@ Example: curl --etag-save storetag.txt https://example.com .fi -See also \fI--etag-compare\fP. Added in 7.68.0. +Added in 7.68.0. .IP "\-\-expect100-timeout " (HTTP) Maximum time in seconds that you allow curl to wait for a 100-continue response when curl emits an Expects: 100-continue header in its request. By @@ -1147,7 +1075,7 @@ line. This way, no transfer failures go undetected by scripts and similar. This option is global and does not need to be specified for each use of \fI\-:, \-\-next\fP. This option does not imply \fI\-f, \-\-fail\fP, which causes transfers to fail due to the -server\(aqs HTTP status code. You can combine the two options, however note \-\-fail +server\(aqs HTTP status code. You can combine the two options, however note \fI\-f, \-\-fail\fP is not global and is therefore contained by \fI\-:, \-\-next\fP. Example: @@ -1155,7 +1083,7 @@ Example: curl --fail-early https://example.com https://two.example .fi -See also \fI-f, --fail\fP and \fI--fail-with-body\fP. Added in 7.52.0. +Added in 7.52.0. .IP "\-\-fail-with-body" (HTTP) Return an error on server errors where the HTTP response code is 400 or greater). In normal cases when an HTTP server fails to deliver a document, it @@ -1163,7 +1091,7 @@ returns an HTML document stating so (which often also describes why and more). This flag will still allow curl to output and save that content but also to return error 22. -This is an alternative option to \-\-fail which makes curl fail for the same +This is an alternative option to \fI\-f, \-\-fail\fP which makes curl fail for the same circumstances but without saving the content. Example: @@ -1173,11 +1101,11 @@ Example: See also \fI-f, --fail\fP. Added in 7.76.0. .IP "\-f, \-\-fail" -(HTTP) Fail fast with no output at all on server errors. This is useful to enable -scripts and users to better deal with failed attempts. In normal cases when an -HTTP server fails to deliver a document, it returns an HTML document stating -so (which often also describes why and more). This flag will prevent curl from -outputting that and return error 22. +(HTTP) Fail silently (no output at all) on server errors. This is mostly done to +enable scripts etc to better deal with failed attempts. In normal cases +when an HTTP server fails to deliver a document, it returns an HTML document +stating so (which often also describes why and more). This flag will prevent +curl from outputting that and return error 22. This method is not fail-safe and there are occasions where non-successful response codes will slip through, especially when authentication is involved @@ -1203,21 +1131,11 @@ Example: curl --false-start https://example.com .fi -See also \fI--tcp-fastopen\fP. Added in 7.42.0. -.IP "\-\-form-escape" -(HTTP) Tells curl to pass on names of multipart form fields and files using -backslash-escaping instead of percent-encoding. - -Example: -.nf - curl --form-escape --form 'field\\name=curl' 'file=@load"this' https://example.com -.fi - -See also \fI-F, --form\fP. Added in 7.81.0. +Added in 7.42.0. .IP "\-\-form-string " -(HTTP SMTP IMAP) Similar to \-\-form except that the value string for the named parameter is used +(HTTP SMTP IMAP) Similar to \fI\-F, \-\-form\fP except that the value string for the named parameter is used literally. Leading \&\(aq@' and \&'<' characters, and the \&';type=' string in -the value have no special meaning. Use this in preference to \-\-form if +the value have no special meaning. Use this in preference to \fI\-F, \-\-form\fP if there\(aqs any possibility that the string value may accidentally trigger the \&\(aq@' or \&'<' features of \fI\-F, \-\-form\fP. @@ -1245,7 +1163,7 @@ file. Tell curl to read content from stdin instead of a file by using \- as filename. This goes for both @ and < constructs. When stdin is used, the contents is buffered in memory first by curl to determine its size and allow a -possible resend. Defining a part\(aqs data from a named non-regular file (such +possible resend. Defining a part\(aqs data from a named non-regular file (such as a named pipe or similar) is unfortunately not subject to buffering and will be effectively read at transmission time; since the full size is unknown before the transfer starts, such data is sent as chunks by HTTP and rejected @@ -1254,54 +1172,38 @@ by IMAP. Example: send an image to an HTTP server, where \&\(aqprofile' is the name of the form-field to which the file portrait.jpg will be the input: -.nf curl \-F profile=@portrait.jpg https://example.com/upload.cgi -.fi Example: send your name and shoe size in two text fields to the server: -.nf curl \-F name=John \-F shoesize=11 https://example.com/ -.fi Example: send your essay in a text field to the server. Send it as a plain text field, but get the contents for it from a local file: -.nf curl \-F "story=HTML message;type=text/html' \\ +.br + \-F \(aq=plain text message' \\ +.br + \-F \(aq= HTML message;type=text/html' \\ +.br \-F \(aq=)' \-F '=@textfile.txt' ... smtp://example.com -.fi Data can be encoded for transfer using encoder=. Available encodings are \fIbinary\fP and \fI8bit\fP that do nothing else than adding the corresponding @@ -1373,10 +1270,9 @@ characters. Example: send multipart mail with a quoted-printable text message and a base64 attached file: -.nf curl \-F \(aq=text message;encoder=quoted-printable' \\ +.br \-F \(aq=@localfile;encoder=base64' ... smtp://example.com -.fi See further examples and details in the MANUAL. @@ -1387,7 +1283,7 @@ Example: curl --form "name=curl" --form "file=@loadthis" https://example.com .fi -See also \fI-d, --data\fP, \fI--form-string\fP and \fI--form-escape\fP. This option is mutually exclusive to \fI-d, --data\fP and \fI-I, --head\fP and \fI-T, --upload-file\fP. +This option overrides \fI-d, --data\fP and \fI-I, --head\fP and \fI-T, --upload-file\fP. .IP "\-\-ftp-account " (FTP) When an FTP server asks for "account data" after user name and password has been provided, this data is sent off using the ACCT command. @@ -1398,8 +1294,6 @@ Example: .nf curl --ftp-account "mr.robot" ftp://example.com/ .fi - -See also \fI-u, --user\fP. .IP "\-\-ftp-alternative-to-user " (FTP) If authenticating with the USER and PASS commands fails, send this command. When connecting to Tumbleweed\(aqs Secure Transport server over FTPS using a @@ -1410,8 +1304,6 @@ Example: .nf curl --ftp-alternative-to-user "U53r" ftp://example.com .fi - -See also \fI--ftp-account\fP and \fI-u, --user\fP. .IP "\-\-ftp-create-dirs" (FTP SFTP) When an FTP or SFTP URL/operation uses a path that does not currently exist on the server, the standard behavior of curl is to fail. Using this option, curl @@ -1446,19 +1338,17 @@ Examples: curl --ftp-method nocwd ftp://example.com/dir1/dir2/file curl --ftp-method singlecwd ftp://example.com/dir1/dir2/file .fi - -See also \fI-l, --list-only\fP. .IP "\-\-ftp-pasv" (FTP) Use passive mode for the data connection. Passive is the internal default -behavior, but using this option can be used to override a previous \-\-ftp-port +behavior, but using this option can be used to override a previous \fI\-P, \-\-ftp-port\fP option. If this option is used several times, only the first one is used. Undoing an enforced passive really is not doable but you must then instead enforce the -correct \-\-ftp-port again. +correct \fI\-P, \-\-ftp-port\fP again. Passive mode means that curl will try the EPSV command first and then PASV, -unless \-\-disable-epsv is used. +unless \fI\-\-disable-epsv\fP is used. Example: .nf @@ -1511,8 +1401,6 @@ Example: .nf curl --ftp-pret ftp://example.com/ .fi - -See also \fI-P, --ftp-port\fP and \fI--ftp-pasv\fP. .IP "\-\-ftp-skip-pasv-ip" (FTP) Tell curl to not use the IP address the server suggests in its response to curl\(aqs PASV command when curl connects the data connection. Instead curl @@ -1562,11 +1450,9 @@ Example: .nf curl --ftp-ssl-control ftp://example.com .fi - -See also \fI--ssl\fP. .IP "\-G, \-\-get" -When used, this option will make all data specified with \fI\-d, \-\-data\fP, \-\-data-binary -or \-\-data-urlencode to be used in an HTTP GET request instead of the POST +When used, this option will make all data specified with \fI\-d, \-\-data\fP, \fI\-\-data-binary\fP +or \fI\-\-data-urlencode\fP to be used in an HTTP GET request instead of the POST request that otherwise would be used. The data will be appended to the URL with a \(aq?' separator. @@ -1583,8 +1469,6 @@ Examples: curl --get -d "tool=curl" -d "age=old" https://example.com curl --get -I -d "tool=curl" https://example.com .fi - -See also \fI-d, --data\fP and \fI-X, --request\fP. .IP "\-g, \-\-globoff" This option switches off the "URL globbing parser". When you set this option, you can specify URLs that contain the letters {}[] without having curl itself @@ -1595,8 +1479,6 @@ Example: .nf curl -g "https://example.com/{[]}}}}" .fi - -See also \fI-K, --config\fP and \fI-q, --disable\fP. .IP "\-\-happy-eyeballs-timeout-ms " Happy Eyeballs is an algorithm that attempts to connect to both IPv4 and IPv6 addresses for dual-stack hosts, giving IPv6 a head-start of the specified @@ -1616,7 +1498,7 @@ Example: curl --happy-eyeballs-timeout-ms 500 https://example.com .fi -See also \fI-m, --max-time\fP and \fI--connect-timeout\fP. Added in 7.59.0. +Added in 7.59.0. .IP "\-\-haproxy-protocol" (HTTP) Send a HAProxy PROXY protocol v1 header at the beginning of the connection. This is used by some load balancers and reverse proxies to @@ -1630,7 +1512,7 @@ Example: curl --haproxy-protocol https://example.com .fi -See also \fI-x, --proxy\fP. Added in 7.60.0. +Added in 7.60.0. .IP "\-I, \-\-head" (HTTP FTP FILE) Fetch the headers only! HTTP-servers feature the command HEAD which this uses to get nothing but the header of a document. When used on an FTP or FILE file, @@ -1640,8 +1522,6 @@ Example: .nf curl -I https://example.com .fi - -See also \fI-G, --get\fP, \fI-v, --verbose\fP and \fI--trace-ascii\fP. .IP "\-H, \-\-header
" (HTTP) Extra header to include in the request when sending HTTP to a server. You may specify any number of extra headers. Note that if you should add a custom @@ -1663,10 +1543,10 @@ This option can take an argument in @filename style, which then adds a header for each line in the input file. Using @- will make curl read the header file from stdin. Added in 7.55.0. -You need \-\-proxy-header to send custom headers intended for an HTTP +You need \fI\-\-proxy-header\fP to send custom headers intended for a HTTP proxy. Added in 7.37.0. -Passing on a "Transfer-Encoding: chunked" header when doing an HTTP request +Passing on a "Transfer-Encoding: chunked" header when doing a HTTP request with a request body, will make curl send the data using chunked encoding. \fBWARNING\fP: headers set with this option will be set in all requests \- even @@ -1696,8 +1576,6 @@ Example: .nf curl --help all .fi - -See also \fI-v, --verbose\fP. .IP "\-\-hostpubmd5 " (SFTP SCP) Pass a string containing 32 hexadecimal digits. The string should be the 128 bit MD5 checksum of the remote host\(aqs public key, curl will refuse @@ -1707,8 +1585,6 @@ Example: .nf curl --hostpubmd5 e5c1c49020640a5ab0f2034854c321a8 sftp://example.com/ .fi - -See also \fI--hostpubsha256\fP. .IP "\-\-hostpubsha256 " (SFTP SCP) Pass a string containing a Base64-encoded SHA256 hash of the remote host\(aqs public key. Curl will refuse the connection with the host @@ -1719,7 +1595,7 @@ Example: curl --hostpubsha256 NDVkMTQxMGQ1ODdmMjQ3MjczYjAyOTY5MmRkMjVmNDQ= sftp://example.com/ .fi -See also \fI--hostpubmd5\fP. Added in 7.80.0. +Added in 7.80.0. .IP "\-\-hsts " (HTTPS) This option enables HSTS for the transfer. If the file name points to an existing HSTS cache file, that will be used. After a completed transfer, the @@ -1736,7 +1612,7 @@ Example: curl --hsts cache.txt https://example.com .fi -See also \fI--proto\fP. Added in 7.74.0. +Added in 7.74.0. .IP "\-\-http0.9" (HTTP) Tells curl to be fine with HTTP version 0.9 response. @@ -1751,7 +1627,7 @@ Example: curl --http0.9 https://example.com .fi -See also \fI--http1.1\fP, \fI--http2\fP and \fI--http3\fP. Added in 7.64.0. +Added in 7.64.0. .IP "\-0, \-\-http1.0" (HTTP) Tells curl to use HTTP version 1.0 instead of using its internally preferred HTTP version. @@ -1761,7 +1637,7 @@ Example: curl --http1.0 https://example.com .fi -See also \fI--http0.9\fP and \fI--http1.1\fP. This option is mutually exclusive to \fI--http1.1\fP and \fI--http2\fP and \fI--http2-prior-knowledge\fP and \fI--http3\fP. +This option overrides \fI--http1.1\fP and \fI--http2\fP. .IP "\-\-http1.1" (HTTP) Tells curl to use HTTP version 1.1. @@ -1770,7 +1646,7 @@ Example: curl --http1.1 https://example.com .fi -See also \fI-0, --http1.0\fP and \fI--http0.9\fP. This option is mutually exclusive to \fI-0, --http1.0\fP and \fI--http2\fP and \fI--http2-prior-knowledge\fP and \fI--http3\fP. Added in 7.33.0. +This option overrides \fI-0, --http1.0\fP and \fI--http2\fP. Added in 7.33.0. .IP "\-\-http2-prior-knowledge" (HTTP) Tells curl to issue its non-TLS HTTP requests using HTTP/2 without HTTP/1.1 Upgrade. It requires prior knowledge that the server supports HTTP/2 straight @@ -1782,7 +1658,7 @@ Example: curl --http2-prior-knowledge https://example.com .fi -See also \fI--http2\fP and \fI--http3\fP. \fI--http2-prior-knowledge\fP requires that the underlying libcurl was built to support HTTP/2. This option is mutually exclusive to \fI--http1.1\fP and \fI-0, --http1.0\fP and \fI--http2\fP and \fI--http3\fP. Added in 7.49.0. +\fI--http2-prior-knowledge\fP requires that the underlying libcurl was built to support HTTP/2. This option overrides \fI--http1.1\fP and \fI-0, --http1.0\fP and \fI--http2\fP. Added in 7.49.0. .IP "\-\-http2" (HTTP) Tells curl to use HTTP version 2. @@ -1792,16 +1668,12 @@ handshake. curl does this by default. For HTTP, this means curl will attempt to upgrade the request to HTTP/2 using the Upgrade: request header. -When curl uses HTTP/2 over HTTPS, it does not itself insist on TLS 1.2 or -higher even though that is required by the specification. A user can add this -version requirement with \fI\-\-tlsv1.2\fP. - Example: .nf curl --http2 https://example.com .fi -See also \fI--http1.1\fP and \fI--http3\fP. \fI--http2\fP requires that the underlying libcurl was built to support HTTP/2. This option is mutually exclusive to \fI--http1.1\fP and \fI-0, --http1.0\fP and \fI--http2-prior-knowledge\fP and \fI--http3\fP. Added in 7.33.0. +See also \fI--http1.1\fP and \fI--http3\fP. \fI--http2\fP requires that the underlying libcurl was built to support HTTP/2. This option overrides \fI--http1.1\fP and \fI-0, --http1.0\fP and \fI--http2-prior-knowledge\fP. Added in 7.33.0. .IP "\-\-http3" (HTTP) \fBWARNING\fP: this option is experimental. Do not use in production. @@ -1818,7 +1690,7 @@ Example: curl --http3 https://example.com .fi -See also \fI--http1.1\fP and \fI--http2\fP. \fI--http3\fP requires that the underlying libcurl was built to support HTTP/3. This option is mutually exclusive to \fI--http1.1\fP and \fI-0, --http1.0\fP and \fI--http2\fP and \fI--http2-prior-knowledge\fP. Added in 7.66.0. +See also \fI--http1.1\fP and \fI--http2\fP. \fI--http3\fP requires that the underlying libcurl was built to support HTTP/3. This option overrides \fI--http1.1\fP and \fI-0, --http1.0\fP and \fI--http2\fP and \fI--http2-prior-knowledge\fP. Added in 7.66.0. .IP "\-\-ignore-content-length" (FTP HTTP) For HTTP, Ignore the Content-Length header. This is particularly useful for servers running Apache 1.x, which will report incorrect Content-Length for @@ -1833,14 +1705,12 @@ Example: .nf curl --ignore-content-length https://example.com .fi - -See also \fI--ftp-skip-pasv-ip\fP. .IP "\-i, \-\-include" Include the HTTP response headers in the output. The HTTP response headers can include things like server name, cookies, date of the document, HTTP version and more... -To view the request headers, consider the \-\-verbose option. +To view the request headers, consider the \fI\-v, \-\-verbose\fP option. Example: .nf @@ -1849,38 +1719,29 @@ Example: See also \fI-v, --verbose\fP. .IP "\-k, \-\-insecure" -(TLS SFTP SCP) By default, every secure connection curl makes is verified to be secure before -the transfer takes place. This option makes curl skip the verification step -and proceed without checking. - -When this option is not used for protocols using TLS, curl verifies the -server\(aqs TLS certificate before it continues: that the certificate contains -the right name which matches the host name used in the URL and that the -certificate has been signed by a CA certificate present in the cert store. +(TLS) By default, every SSL connection curl makes is verified to be secure. This +option allows curl to proceed and operate even for server connections +otherwise considered insecure. + +The server connection is verified by making sure the server\(aqs certificate +contains the right name and verifies successfully using the cert store. + See this online resource for further details: -.nf https://curl.se/docs/sslcerts.html -.fi -For SFTP and SCP, this option makes curl skip the \fIknown_hosts\fP verification. -\fIknown_hosts\fP is a file normally stored in the user\(aqs home directory in the -\&.ssh subdirectory, which contains host names and their public keys. - -\fBWARNING\fP: using this option makes the transfer insecure. +\fBWARNING\fP: this makes the transfer insecure. Example: .nf curl --insecure https://example.com .fi -See also \fI--proxy-insecure\fP, \fI--cacert\fP and \fI--capath\fP. +See also \fI--proxy-insecure\fP and \fI--cacert\fP. .IP "\-\-interface " Perform an operation using a specified interface. You can enter interface name, IP address or host name. An example could look like: -.nf curl \-\-interface eth0:1 https://www.example.com/ -.fi If this option is used several times, the last one will be used. @@ -1895,57 +1756,25 @@ Example: See also \fI--dns-interface\fP. .IP "\-4, \-\-ipv4" -This option tells curl to use IPv4 addresses only, and not for example try -IPv6. +This option tells curl to resolve names to IPv4 addresses only, and not for +example try IPv6. Example: .nf curl --ipv4 https://example.com .fi -See also \fI--http1.1\fP and \fI--http2\fP. This option is mutually exclusive to \fI-6, --ipv6\fP. +See also \fI--http1.1\fP and \fI--http2\fP. This option overrides \fI-6, --ipv6\fP. .IP "\-6, \-\-ipv6" -This option tells curl to use IPv6 addresses only, and not for example try -IPv4. +This option tells curl to resolve names to IPv6 addresses only, and not for +example try IPv4. Example: .nf curl --ipv6 https://example.com .fi -See also \fI--http1.1\fP and \fI--http2\fP. This option is mutually exclusive to \fI-4, --ipv4\fP. -.IP "\-\-json " -(HTTP) Sends the specified JSON data in a POST request to the HTTP server. \-\-json -works as a shortcut for passing on these three options: - -.nf - \-\-data [arg] - \-\-header "Content-Type: application/json" - \-\-header "Accept: application/json" -.fi - -There is \fI\fPno verification\fI\fP that the passed in data is actual JSON or that -the syntax is correct. - -If you start the data with the letter @, the rest should be a file name to -read the data from, or a single dash (-) if you want curl to read the data -from stdin. Posting data from a file named \&\(aqfoobar' would thus be done with -\fI\-\-json\fP @foobar and to instead read the data from stdin, use \-\-json @-. - -If this option is used more than once on the same command line, the additional -data pieces will be concatenated to the previous before sending. - -The headers this option sets can be overridden with \-\-header as usual. - -Examples: -.nf - curl --json '{ "drink": "coffe" }' https://example.com - curl --json '{ "drink":' --json ' "coffe" }' https://example.com - curl --json @prepared https://example.com - curl --json @- https://example.com < json.txt -.fi - -See also \fI--data-binary\fP and \fI--data-raw\fP. This option is mutually exclusive to \fI-F, --form\fP and \fI-I, --head\fP and \fI-T, --upload-file\fP. Added in 7.82.0. +See also \fI--http1.1\fP and \fI--http2\fP. This option overrides \fI-4, --ipv4\fP. .IP "\-j, \-\-junk-session-cookies" (HTTP) When curl is told to read cookies from a given file, this option will make it discard all "session cookies". This will basically have the same effect as if @@ -1962,11 +1791,8 @@ See also \fI-b, --cookie\fP and \fI-c, --cookie-jar\fP. This option sets the time a connection needs to remain idle before sending keepalive probes and the time between individual keepalive probes. It is currently effective on operating systems offering the TCP_KEEPIDLE and -TCP_KEEPINTVL socket options (meaning Linux, recent AIX, HP-UX and more). -Keepalives are used by the TCP stack to detect broken networks on idle -connections. The number of missed keepalive probes before declaring the -connection down is OS dependent and is commonly 9 or 10. This option has no -effect if \-\-no-keepalive is used. +TCP_KEEPINTVL socket options (meaning Linux, recent AIX, HP-UX and more). This +option has no effect if \fI\-\-no-keepalive\fP is used. If this option is used several times, the last one will be used. If unspecified, the option defaults to 60 seconds. @@ -1975,10 +1801,8 @@ Example: .nf curl --keepalive-time 20 https://example.com .fi - -See also \fI--no-keepalive\fP and \fI-m, --max-time\fP. .IP "\-\-key-type " -(TLS) Private key file type. Specify which type your \-\-key provided private key +(TLS) Private key file type. Specify which type your \fI\-\-key\fP provided private key is. DER, PEM, and ENG are supported. If not specified, PEM is assumed. If this option is used several times, the last one will be used. @@ -1987,8 +1811,6 @@ Example: .nf curl --key-type DER --key here https://example.com .fi - -See also \fI--key\fP. .IP "\-\-key " (TLS SSH) Private key file name. Allows you to provide your private key in this separate file. For SSH, if not specified, curl tries the following candidates in order: @@ -1997,23 +1819,16 @@ file. For SSH, if not specified, curl tries the following candidates in order: If curl is built against OpenSSL library, and the engine pkcs11 is available, then a PKCS#11 URI (RFC 7512) can be used to specify a private key located in a PKCS#11 device. A string beginning with "pkcs11:" will be interpreted as a -PKCS#11 URI. If a PKCS#11 URI is provided, then the \-\-engine option will be set -as "pkcs11" if none was provided and the \-\-key-type option will be set as +PKCS#11 URI. If a PKCS#11 URI is provided, then the \fI\-\-engine\fP option will be set +as "pkcs11" if none was provided and the \fI\-\-key-type\fP option will be set as "ENG" if none was provided. -If curl is built against Secure Transport or Schannel then this option is -ignored for TLS protocols (HTTPS, etc). Those backends expect the private key -to be already present in the keychain or PKCS#12 file containing the -certificate. - If this option is used several times, the last one will be used. Example: .nf curl --cert certificate --key here https://example.com .fi - -See also \fI--key-type\fP and \fI-E, --cert\fP. .IP "\-\-krb " (FTP) Enable Kerberos authentication and use. The level must be entered and should be one of \(aqclear', 'safe', 'confidential', or 'private'. Should you use a @@ -2026,7 +1841,7 @@ Example: curl --krb clear ftp://example.com/ .fi -See also \fI--delegation\fP and \fI--ssl\fP. \fI--krb\fP requires that the underlying libcurl was built to support Kerberos. +\fI--krb\fP requires that the underlying libcurl was built to support Kerberos. .IP "\-\-libcurl " Append this option to any ordinary curl command line, and you will get libcurl-using C source code written to the file that does the equivalent @@ -2042,8 +1857,6 @@ Example: .nf curl --libcurl client.c https://example.com .fi - -See also \fI-v, --verbose\fP. .IP "\-\-limit-rate " Specify the maximum transfer rate you want curl to use \- for both downloads and uploads. This feature is useful if you have a limited pipe and you would like @@ -2058,7 +1871,7 @@ are 1024 based. For example 1k is 1024. Examples: 200K, 3m and 1G. The rate limiting logic works on averaging the transfer speed to no more than the set threshold over a period of multiple seconds. -If you also use the \-\-speed-limit option, that option will take precedence and +If you also use the \fI\-Y, \-\-speed-limit\fP option, that option will take precedence and might cripple the rate-limiting slightly, to help keeping the speed-limit logic working. @@ -2070,8 +1883,6 @@ Examples: curl --limit-rate 1000 https://example.com curl --limit-rate 10M https://example.com .fi - -See also \fI-Y, --speed-limit\fP and \fI-y, --speed-time\fP. .IP "\-l, \-\-list-only" (FTP POP3) (FTP) When listing an FTP directory, this switch forces a name-only view. This is @@ -2096,8 +1907,6 @@ Example: .nf curl --list-only ftp://example.com/dir/ .fi - -See also \fI-Q, --quote\fP and \fI-X, --request\fP. .IP "\-\-local-port " Set a preferred single number or range (FROM-TO) of local port numbers to use for the connection(s). Note that port numbers by nature are a scarce resource @@ -2108,8 +1917,6 @@ Example: .nf curl --local-port 1000-3000 https://example.com .fi - -See also \fI-g, --globoff\fP. .IP "\-\-location-trusted" (HTTP) Like \fI\-L, \-\-location\fP, but will allow sending the name + password to all hosts that the site may redirect to. This may or may not introduce a security breach if @@ -2126,12 +1933,12 @@ See also \fI-u, --user\fP. (HTTP) If the server reports that the requested page has moved to a different location (indicated with a Location: header and a 3XX response code), this option will make curl redo the request on the new place. If used together with -\-\-include or \fI\-I, \-\-head\fP, headers from all requested pages will be shown. When +\fI\-i, \-\-include\fP or \fI\-I, \-\-head\fP, headers from all requested pages will be shown. When authentication is used, curl only sends its credentials to the initial host. If a redirect takes curl to a different host, it will not be able to -intercept the user+password. See also \-\-location-trusted on how to change +intercept the user+password. See also \fI\-\-location-trusted\fP on how to change this. You can limit the amount of redirects to follow by using the -\-\-max-redirs option. +\fI\-\-max-redirs\fP option. When curl follows a redirect and if the request is a POST, it will send the following request with a GET if the HTTP response was 301, 302, or 303. If the @@ -2139,19 +1946,17 @@ response code was any other 3xx code, curl will re-send the following request using the same unmodified method. You can tell curl to not change POST requests to GET after a 30x response by -using the dedicated options for that: \fI\-\-post301\fP, \-\-post302 and \fI\-\-post303\fP. +using the dedicated options for that: \fI\-\-post301\fP, \fI\-\-post302\fP and \fI\-\-post303\fP. -The method set with \-\-request overrides the method curl would otherwise select +The method set with \fI\-X, \-\-request\fP overrides the method curl would otherwise select to use. Example: .nf curl -L https://example.com .fi - -See also \fI--resolve\fP and \fI--alt-svc\fP. .IP "\-\-login-options " -(IMAP LDAP POP3 SMTP) Specify the login options to use during server authentication. +(IMAP POP3 SMTP) Specify the login options to use during server authentication. You can use login options to specify protocol specific options that may be used during authentication. At present only IMAP, POP3 and SMTP support @@ -2165,7 +1970,7 @@ Example: curl --login-options 'AUTH=*' imap://example.com .fi -See also \fI-u, --user\fP. Added in 7.34.0. +Added in 7.34.0. .IP "\-\-mail-auth
" (SMTP) Specify a single address. This will be used to specify the authentication address (identity) of a submitted message that is being relayed to another @@ -2191,7 +1996,7 @@ See also \fI--mail-rcpt\fP and \fI--mail-auth\fP. conversation if at least one of the recipients causes RCPT TO command to return an error. -The default behavior can be changed by passing \-\-mail-rcpt-allowfails +The default behavior can be changed by passing \fI\-\-mail-rcpt-allowfails\fP command-line option which will make curl ignore errors and proceed with the remaining valid recipients. @@ -2204,9 +2009,9 @@ Example: curl --mail-rcpt-allowfails --mail-rcpt dest@example.com smtp://example.com .fi -See also \fI--mail-rcpt\fP. Added in 7.69.0. +Added in 7.69.0. .IP "\-\-mail-rcpt
" -(SMTP) Specify a single email address, user name or mailing list name. Repeat this +(SMTP) Specify a single e-mail address, user name or mailing list name. Repeat this option several times to send to multiple recipients. When performing an address verification (VRFY command), the recipient should be @@ -2221,8 +2026,6 @@ Example: .nf curl --mail-rcpt user@example.net smtp://example.com .fi - -See also \fI--mail-rcpt-allowfails\fP. .IP "\-M, \-\-manual" Manual. Display the huge help text. @@ -2230,8 +2033,6 @@ Example: .nf curl --manual .fi - -See also \fI-v, --verbose\fP, \fI--libcurl\fP and \fI--trace\fP. .IP "\-\-max-filesize " (FTP HTTP MQTT) Specify the maximum size (in bytes) of a file to download. If the file requested is larger than this value, the transfer will not start and curl will @@ -2251,7 +2052,7 @@ Example: See also \fI--limit-rate\fP. .IP "\-\-max-redirs " -(HTTP) Set maximum number of redirections to follow. When \-\-location is used, to +(HTTP) Set maximum number of redirections to follow. When \fI\-L, \-\-location\fP is used, to prevent curl from following too many redirects, by default, the limit is set to 50 redirects. Set this option to \-1 to make it unlimited. @@ -2261,19 +2062,13 @@ Example: .nf curl --max-redirs 3 --location https://example.com .fi - -See also \fI-L, --location\fP. .IP "\-m, \-\-max-time " -Maximum time in seconds that you allow each transfer to take. This is +Maximum time in seconds that you allow the whole operation to take. This is useful for preventing your batch jobs from hanging for hours due to slow networks or links going down. Since 7.32.0, this option accepts decimal values, but the actual timeout will decrease in accuracy as the specified timeout increases in decimal precision. -If you enable retrying the transfer (\fI\-\-retry\fP) then the maximum time counter is -reset each time the transfer is retried. You can use \-\-retry-max-time to limit -the retry time. - If this option is used several times, the last one will be used. Examples: @@ -2282,7 +2077,7 @@ Examples: curl --max-time 2.92 https://example.com .fi -See also \fI--connect-timeout\fP and \fI--retry-max-time\fP. +See also \fI--connect-timeout\fP. .IP "\-\-metalink" This option was previously used to specify a metalink resource. Metalink support has been disabled in curl since 7.78.0 for security reasons. @@ -2291,17 +2086,15 @@ Example: .nf curl --metalink file https://example.com .fi - -See also \fI-Z, --parallel\fP. .IP "\-\-negotiate" (HTTP) Enables Negotiate (SPNEGO) authentication. This option requires a library built with GSS-API or SSPI support. Use -\-\-version to see if your curl supports GSS-API/SSPI or SPNEGO. +\fI\-V, \-\-version\fP to see if your curl supports GSS-API/SSPI or SPNEGO. -When using this option, you must also provide a fake \-\-user option to activate +When using this option, you must also provide a fake \fI\-u, \-\-user\fP option to activate the authentication code properly. Sending a \(aq-u :' is enough as the user name -and password from the \-\-user option are not actually used. +and password from the \fI\-u, \-\-user\fP option are not actually used. If this option is used several times, only the first one is used. @@ -2313,28 +2106,28 @@ Example: See also \fI--basic\fP, \fI--ntlm\fP, \fI--anyauth\fP and \fI--proxy-negotiate\fP. .IP "\-\-netrc-file " This option is similar to \fI\-n, \-\-netrc\fP, except that you provide the path (absolute -or relative) to the netrc file that curl should use. You can only specify one -netrc file per invocation. If several \-\-netrc-file options are provided, +or relative) to the netrc file that curl should use. You can only specify one +netrc file per invocation. If several \fI\-\-netrc-file\fP options are provided, the last one will be used. -It will abide by \-\-netrc-optional if specified. +It will abide by \fI\-\-netrc-optional\fP if specified. Example: .nf curl --netrc-file netrc https://example.com .fi -See also \fI-n, --netrc\fP, \fI-u, --user\fP and \fI-K, --config\fP. This option is mutually exclusive to \fI-n, --netrc\fP. +This option overrides \fI-n, --netrc\fP. .IP "\-\-netrc-optional" Similar to \fI\-n, \-\-netrc\fP, but this option makes the .netrc usage \fBoptional\fP -and not mandatory as the \-\-netrc option does. +and not mandatory as the \fI\-n, \-\-netrc\fP option does. Example: .nf curl --netrc-optional https://example.com .fi -See also \fI--netrc-file\fP. This option is mutually exclusive to \fI-n, --netrc\fP. +See also \fI--netrc-file\fP. This option overrides \fI-n, --netrc\fP. .IP "\-n, \-\-netrc" Makes curl scan the \fI.netrc\fP (\fI_netrc\fP on Windows) file in the user\(aqs home directory for login name and password. This is typically used for FTP on @@ -2346,29 +2139,23 @@ to find the home directory. A quick and simple example of how to setup a \fI.netrc\fP to allow curl to FTP to the machine host.domain.com with user name \&\(aqmyself' and password \&'secret' -could look similar to: +should look similar to: -.nf - machine host.domain.com - login myself - password secret" -.fi +.B "machine host.domain.com login myself password secret" Example: .nf curl --netrc https://example.com .fi - -See also \fI--netrc-file\fP, \fI-K, --config\fP and \fI-u, --user\fP. .IP "\-:, \-\-next" Tells curl to use a separate operation for the following URL and associated options. This allows you to send several URL requests, each with their own specific options, for example, such as different user names or custom requests for each. -\-\-next will reset all local options and only global ones will have their -values survive over to the operation following the \-\-next instruction. Global -options include \fI\-v, \-\-verbose\fP, \fI\-\-trace\fP, \-\-trace-ascii and \fI\-\-fail-early\fP. +\fI\-:, \-\-next\fP will reset all local options and only global ones will have their +values survive over to the operation following the \fI\-:, \-\-next\fP instruction. Global +options include \fI\-v, \-\-verbose\fP, \fI\-\-trace\fP, \fI\-\-trace-ascii\fP and \fI\-\-fail-early\fP. For example, you can do both a GET and a POST in a single command line: @@ -2382,7 +2169,7 @@ Examples: curl -I https://example.com --next https://example.net/ .fi -See also \fI-Z, --parallel\fP and \fI-K, --config\fP. Added in 7.36.0. +Added in 7.36.0. .IP "\-\-no-alpn" (HTTPS) Disable the ALPN TLS extension. ALPN is enabled by default if libcurl was built with an SSL library that supports ALPN. ALPN is used by a libcurl that supports @@ -2407,25 +2194,6 @@ Example: .nf curl --no-buffer https://example.com .fi - -See also \fI-#, --progress-bar\fP. -.IP "\-\-no-clobber" -When used in conjunction with the \fI\-o, \-\-output\fP, \fI\-J, \-\-remote-header-name\fP, -\fI\-O, \-\-remote-name\fP, or \-\-remote-name-all options, curl avoids overwriting files -that already exist. Instead, a dot and a number gets appended to the name -of the file that would be created, up to filename.100 after which it will not -create any file. - -Note that this is the negated option name documented. You can thus use -\-\-clobber to enforce the clobbering, even if \-\-remote-header-name or \-J is -specified. - -Example: -.nf - curl --no-clobber --output local/dir/file https://example.com -.fi - -See also \fI-o, --output\fP and \fI-O, --remote-name\fP. Added in 7.83.0. .IP "\-\-no-keepalive" Disables the use of keepalive messages on the TCP connection. curl otherwise enables them by default. @@ -2437,8 +2205,6 @@ Example: .nf curl --no-keepalive https://example.com .fi - -See also \fI--keepalive-time\fP. .IP "\-\-no-npn" (HTTPS) Disable the NPN TLS extension. NPN is enabled by default if libcurl was built with an SSL library that supports NPN. NPN is used by a libcurl that supports @@ -2452,7 +2218,7 @@ Example: See also \fI--no-alpn\fP and \fI--http2\fP. \fI--no-npn\fP requires that the underlying libcurl was built to support TLS. Added in 7.36.0. .IP "\-\-no-progress-meter" Option to switch off the progress meter output without muting or otherwise -affecting warning and informational messages like \-\-silent does. +affecting warning and informational messages like \fI\-s, \-\-silent\fP does. Note that this is the negated option name documented. You can thus use \-\-progress-meter to enable the progress meter again. @@ -2464,7 +2230,7 @@ Example: See also \fI-v, --verbose\fP and \fI-s, --silent\fP. Added in 7.67.0. .IP "\-\-no-sessionid" -(TLS) Disable curl\(aqs use of SSL session-ID caching. By default all transfers are +(TLS) Disable curl\(aqs use of SSL session-ID caching. By default all transfers are done using the cache. Note that while nothing should ever get hurt by attempting to reuse SSL session-IDs, there seem to be broken SSL implementations in the wild that may require you to disable this in order for @@ -2477,8 +2243,6 @@ Example: .nf curl --no-sessionid https://example.com .fi - -See also \fI-k, --insecure\fP. .IP "\-\-noproxy " Comma-separated list of hosts for which not to use a proxy, if one is specified. The only wildcard is a single * character, which matches all hosts, @@ -2495,10 +2259,8 @@ Example: .nf curl --noproxy "www.example" https://example.com .fi - -See also \fI-x, --proxy\fP. .IP "\-\-ntlm-wb" -(HTTP) Enables NTLM much in the style \-\-ntlm does, but hand over the authentication +(HTTP) Enables NTLM much in the style \fI\-\-ntlm\fP does, but hand over the authentication to the separate binary ntlmauth application that is executed when needed. Example: @@ -2525,11 +2287,11 @@ Example: curl --ntlm -u user:password https://example.com .fi -See also \fI--proxy-ntlm\fP. \fI--ntlm\fP requires that the underlying libcurl was built to support TLS. This option is mutually exclusive to \fI--basic\fP and \fI--negotiate\fP and \fI--digest\fP and \fI--anyauth\fP. +See also \fI--proxy-ntlm\fP. \fI--ntlm\fP requires that the underlying libcurl was built to support TLS. This option overrides \fI--basic\fP and \fI--negotiate\fP and \fI--digest\fP and \fI--anyauth\fP. .IP "\-\-oauth2-bearer " -(IMAP LDAP POP3 SMTP HTTP) Specify the Bearer Token for OAUTH 2.0 server authentication. The Bearer Token +(IMAP POP3 SMTP HTTP) Specify the Bearer Token for OAUTH 2.0 server authentication. The Bearer Token is used in conjunction with the user name which can be specified as part of -the \-\-url or \-\-user options. +the \fI\-\-url\fP or \fI\-u, \-\-user\fP options. The Bearer Token and user name are formatted according to RFC 6750. @@ -2540,17 +2302,17 @@ Example: curl --oauth2-bearer "mF_9.B5f-4.1JqM" https://example.com .fi -See also \fI--basic\fP, \fI--ntlm\fP and \fI--digest\fP. Added in 7.33.0. +Added in 7.33.0. .IP "\-\-output-dir " This option specifies the directory in which files should be stored, when -\-\-remote-name or \-\-output are used. +\fI\-O, \-\-remote-name\fP or \fI\-o, \-\-output\fP are used. The given output directory is used for all URLs and output options on the command line, up until the first \fI\-:, \-\-next\fP. If the specified target directory does not exist, the operation will fail -unless \-\-create-dirs is also used. +unless \fI\-\-create-dirs\fP is also used. If this option is used multiple times, the last specified directory will be used. @@ -2567,47 +2329,35 @@ multiple documents, you should quote the URL and you can use \(aq#' followed by number in the specifier. That variable will be replaced with the current string for the URL being fetched. Like in: -.nf curl "http://{one,two}.example.com" \-o "file_#1.txt" -.fi or use several variables like: -.nf curl "http://{site,host}.host[1-5].com" \-o "#1_#2" -.fi You may use this option as many times as the number of URLs you have. For example, if you specify two URLs on the same command line, you can use it like this: -.nf curl \-o aa example.com \-o bb example.net -.fi and the order of the \-o options and the URLs does not matter, just that the first \-o is for the first URL and so on, so the above command line can also be written as -.nf curl example.com example.net \-o aa \-o bb -.fi -See also the \-\-create-dirs option to create the local directories +See also the \fI\-\-create-dirs\fP option to create the local directories dynamically. Specifying the output as \(aq-' (a single dash) will force the output to be done to stdout. To suppress response bodies, you can redirect output to /dev/null: -.nf curl example.com \-o /dev/null -.fi Or for Windows use nul: -.nf curl example.com \-o nul -.fi Examples: .nf @@ -2660,7 +2410,7 @@ Example: curl --parallel https://example.com -o file1 https://example.com -o file2 .fi -See also \fI-:, --next\fP and \fI-v, --verbose\fP. Added in 7.66.0. +Added in 7.66.0. .IP "\-\-pass " (SSH TLS) Passphrase for the private key. @@ -2670,8 +2420,6 @@ Example: .nf curl --pass secret --key file https://example.com .fi - -See also \fI--key\fP and \fI-u, --user\fP. .IP "\-\-path-as-is" Tell curl to not handle sequences of /../ or /./ in the given URL path. Normally curl will squash or merge them according to standards but with @@ -2682,7 +2430,7 @@ Example: curl --path-as-is https://example.com/../../etc/passwd .fi -See also \fI--request-target\fP. Added in 7.42.0. +Added in 7.42.0. .IP "\-\-pinnedpubkey " (TLS) Tells curl to use the specified public key file (or hashes) to verify the peer. This can be a path to a file which contains a single public key in PEM @@ -2718,7 +2466,7 @@ Examples: curl --pinnedpubkey 'sha256//ce118b51897f4452dc' https://example.com .fi -See also \fI--hostpubsha256\fP. Added in 7.39.0. +Added in 7.39.0. .IP "\-\-post301" (HTTP) Tells curl to respect RFC 7231/6.4.2 and not convert POST requests into GET requests when following a 301 redirection. The non-RFC behavior is ubiquitous @@ -2781,7 +2529,7 @@ Example: curl --preproxy socks5://proxy.example -x http://http.example https://example.com .fi -See also \fI-x, --proxy\fP and \fI--socks5\fP. Added in 7.52.0. +Added in 7.52.0. .IP "\-#, \-\-progress-bar" Make curl display transfer progress as a simple progress bar instead of the standard, more informational, meter. @@ -2799,8 +2547,6 @@ Example: .nf curl -# -O https://example.com .fi - -See also \fI--styled-output\fP. .IP "\-\-proto-default " Tells curl to use \fIprotocol\fP for any URL missing a scheme name. @@ -2810,24 +2556,22 @@ An unknown or unsupported protocol causes error This option does not change the default proxy protocol (http). Without this option set, curl guesses protocol based on the host name, see -\-\-url for details. +\fI\-\-url\fP for details. Example: .nf curl --proto-default https ftp.example.com .fi -See also \fI--proto\fP and \fI--proto-redir\fP. Added in 7.45.0. +Added in 7.45.0. .IP "\-\-proto-redir " Tells curl to limit what protocols it may use on redirect. Protocols denied by -\-\-proto are not overridden by this option. See \-\-proto for how protocols are +\fI\-\-proto\fP are not overridden by this option. See \-\-proto for how protocols are represented. Example, allow only HTTP and HTTPS on redirect: -.nf curl \-\-proto-redir \-all,http,https http://example.com -.fi By default curl will only allow HTTP, HTTPS, FTP and FTPS on redirect (since 7.65.2). Specifying \fIall\fP or \fI+all\fP enables all protocols on redirects, which @@ -2837,8 +2581,6 @@ Example: .nf curl --proto-redir =http,https https://example.com .fi - -See also \fI--proto\fP. .IP "\-\-proto " Tells curl to limit what protocols it may use for transfers. Protocols are evaluated left to right, are comma separated, and are each a protocol name or @@ -2896,7 +2638,7 @@ Example: See also \fI-x, --proxy\fP, \fI--proxy-basic\fP and \fI--proxy-digest\fP. .IP "\-\-proxy-basic" Tells curl to use HTTP Basic authentication when communicating with the given -proxy. Use \-\-basic for enabling HTTP Basic with a remote host. Basic is the +proxy. Use \fI\-\-basic\fP for enabling HTTP Basic with a remote host. Basic is the default authentication method curl uses with proxies. Example: @@ -2906,7 +2648,7 @@ Example: See also \fI-x, --proxy\fP, \fI--proxy-anyauth\fP and \fI--proxy-digest\fP. .IP "\-\-proxy-cacert " -Same as \-\-cacert but used in HTTPS proxy context. +Same as \fI\-\-cacert\fP but used in HTTPS proxy context. Example: .nf @@ -2915,7 +2657,7 @@ Example: See also \fI--proxy-capath\fP, \fI--cacert\fP, \fI--capath\fP and \fI-x, --proxy\fP. Added in 7.52.0. .IP "\-\-proxy-capath " -Same as \-\-capath but used in HTTPS proxy context. +Same as \fI\-\-capath\fP but used in HTTPS proxy context. Example: .nf @@ -2924,44 +2666,44 @@ Example: See also \fI--proxy-cacert\fP, \fI-x, --proxy\fP and \fI--capath\fP. Added in 7.52.0. .IP "\-\-proxy-cert-type " -Same as \-\-cert-type but used in HTTPS proxy context. +Same as \fI\-\-cert-type\fP but used in HTTPS proxy context. Example: .nf curl --proxy-cert-type PEM --proxy-cert file -x https://proxy https://example.com .fi -See also \fI--proxy-cert\fP. Added in 7.52.0. +Added in 7.52.0. .IP "\-\-proxy-cert " -Same as \-\-cert but used in HTTPS proxy context. +Same as \fI\-E, \-\-cert\fP but used in HTTPS proxy context. Example: .nf curl --proxy-cert file -x https://proxy https://example.com .fi -See also \fI--proxy-cert-type\fP. Added in 7.52.0. +Added in 7.52.0. .IP "\-\-proxy-ciphers " -Same as \-\-ciphers but used in HTTPS proxy context. +Same as \fI\-\-ciphers\fP but used in HTTPS proxy context. Example: .nf curl --proxy-ciphers ECDHE-ECDSA-AES256-CCM8 -x https://proxy https://example.com .fi -See also \fI--ciphers\fP, \fI--curves\fP and \fI-x, --proxy\fP. Added in 7.52.0. +Added in 7.52.0. .IP "\-\-proxy-crlfile " -Same as \-\-crlfile but used in HTTPS proxy context. +Same as \fI\-\-crlfile\fP but used in HTTPS proxy context. Example: .nf curl --proxy-crlfile rejects.txt -x https://proxy https://example.com .fi -See also \fI--crlfile\fP and \fI-x, --proxy\fP. Added in 7.52.0. +Added in 7.52.0. .IP "\-\-proxy-digest" Tells curl to use HTTP Digest authentication when communicating with the given -proxy. Use \-\-digest for enabling HTTP Digest with a remote host. +proxy. Use \fI\-\-digest\fP for enabling HTTP Digest with a remote host. Example: .nf @@ -2971,7 +2713,7 @@ Example: See also \fI-x, --proxy\fP, \fI--proxy-anyauth\fP and \fI--proxy-basic\fP. .IP "\-\-proxy-header
" (HTTP) Extra header to include in the request when sending HTTP to a proxy. You may -specify any number of extra headers. This is the equivalent option to \-\-header +specify any number of extra headers. This is the equivalent option to \fI\-H, \-\-header\fP but is for proxy communication only like in CONNECT requests when you want a separate header sent to the proxy to what is sent to the actual remote host. @@ -2996,37 +2738,37 @@ Examples: curl --proxy-header "Host:" -x http://proxy https://example.com .fi -See also \fI-x, --proxy\fP. Added in 7.37.0. +Added in 7.37.0. .IP "\-\-proxy-insecure" -Same as \-\-insecure but used in HTTPS proxy context. +Same as \fI\-k, \-\-insecure\fP but used in HTTPS proxy context. Example: .nf curl --proxy-insecure -x https://proxy https://example.com .fi -See also \fI-x, --proxy\fP and \fI-k, --insecure\fP. Added in 7.52.0. +Added in 7.52.0. .IP "\-\-proxy-key-type " -Same as \-\-key-type but used in HTTPS proxy context. +Same as \fI\-\-key-type\fP but used in HTTPS proxy context. Example: .nf curl --proxy-key-type DER --proxy-key here -x https://proxy https://example.com .fi -See also \fI--proxy-key\fP and \fI-x, --proxy\fP. Added in 7.52.0. +Added in 7.52.0. .IP "\-\-proxy-key " -Same as \-\-key but used in HTTPS proxy context. +Same as \fI\-\-key\fP but used in HTTPS proxy context. Example: .nf curl --proxy-key here -x https://proxy https://example.com .fi -See also \fI--proxy-key-type\fP and \fI-x, --proxy\fP. Added in 7.52.0. +Added in 7.52.0. .IP "\-\-proxy-negotiate" Tells curl to use HTTP Negotiate (SPNEGO) authentication when communicating -with the given proxy. Use \-\-negotiate for enabling HTTP Negotiate (SPNEGO) +with the given proxy. Use \fI\-\-negotiate\fP for enabling HTTP Negotiate (SPNEGO) with a remote host. Example: @@ -3037,7 +2779,7 @@ Example: See also \fI--proxy-anyauth\fP and \fI--proxy-basic\fP. .IP "\-\-proxy-ntlm" Tells curl to use HTTP NTLM authentication when communicating with the given -proxy. Use \-\-ntlm for enabling NTLM with a remote host. +proxy. Use \fI\-\-ntlm\fP for enabling NTLM with a remote host. Example: .nf @@ -3046,14 +2788,14 @@ Example: See also \fI--proxy-negotiate\fP and \fI--proxy-anyauth\fP. .IP "\-\-proxy-pass " -Same as \-\-pass but used in HTTPS proxy context. +Same as \fI\-\-pass\fP but used in HTTPS proxy context. Example: .nf curl --proxy-pass secret --proxy-key here -x https://proxy https://example.com .fi -See also \fI-x, --proxy\fP and \fI--proxy-key\fP. Added in 7.52.0. +Added in 7.52.0. .IP "\-\-proxy-pinnedpubkey " (TLS) Tells curl to use the specified public key file (or hashes) to verify the proxy. This can be a path to a file which contains a single public key in PEM @@ -3073,7 +2815,7 @@ Examples: curl --proxy-pinnedpubkey 'sha256//ce118b51897f4452dc' https://example.com .fi -See also \fI--pinnedpubkey\fP and \fI-x, --proxy\fP. Added in 7.59.0. +Added in 7.59.0. .IP "\-\-proxy-service-name " This option allows you to change the service name for proxy negotiation. @@ -3082,37 +2824,35 @@ Example: curl --proxy-service-name "shrubbery" -x proxy https://example.com .fi -See also \fI--service-name\fP and \fI-x, --proxy\fP. Added in 7.43.0. +Added in 7.43.0. .IP "\-\-proxy-ssl-allow-beast" -Same as \-\-ssl-allow-beast but used in HTTPS proxy context. +Same as \fI\-\-ssl-allow-beast\fP but used in HTTPS proxy context. Example: .nf curl --proxy-ssl-allow-beast -x https://proxy https://example.com .fi -See also \fI--ssl-allow-beast\fP and \fI-x, --proxy\fP. Added in 7.52.0. +Added in 7.52.0. .IP "\-\-proxy-ssl-auto-client-cert" -Same as \-\-ssl-auto-client-cert but used in HTTPS proxy context. +Same as \fI\-\-ssl-auto-client-cert\fP but used in HTTPS proxy context. Example: .nf curl --proxy-ssl-auto-client-cert -x https://proxy https://example.com .fi -See also \fI--ssl-auto-client-cert\fP and \fI-x, --proxy\fP. Added in 7.77.0. +Added in 7.77.0. .IP "\-\-proxy-tls13-ciphers " (TLS) Specifies which cipher suites to use in the connection to your HTTPS proxy when it negotiates TLS 1.3. The list of ciphers suites must specify valid ciphers. Read up on TLS 1.3 cipher suite details on this URL: -.nf https://curl.se/docs/ssl-ciphers.html -.fi This option is currently used only when curl is built to use OpenSSL 1.1.1 or later. If you are using a different SSL backend you can try setting TLS 1.3 -cipher suites by using the \-\-proxy-ciphers option. +cipher suites by using the \fI\-\-proxy-ciphers\fP option. If this option is used several times, the last one will be used. @@ -3121,43 +2861,43 @@ Example: curl --proxy-tls13-ciphers TLS_AES_128_GCM_SHA256 -x proxy https://example.com .fi -See also \fI--tls13-ciphers\fP and \fI--curves\fP. Added in 7.61.0. +Added in 7.61.0. .IP "\-\-proxy-tlsauthtype " -Same as \-\-tlsauthtype but used in HTTPS proxy context. +Same as \fI\-\-tlsauthtype\fP but used in HTTPS proxy context. Example: .nf curl --proxy-tlsauthtype SRP -x https://proxy https://example.com .fi -See also \fI-x, --proxy\fP and \fI--proxy-tlsuser\fP. Added in 7.52.0. +Added in 7.52.0. .IP "\-\-proxy-tlspassword " -Same as \-\-tlspassword but used in HTTPS proxy context. +Same as \fI\-\-tlspassword\fP but used in HTTPS proxy context. Example: .nf curl --proxy-tlspassword passwd -x https://proxy https://example.com .fi -See also \fI-x, --proxy\fP and \fI--proxy-tlsuser\fP. Added in 7.52.0. +Added in 7.52.0. .IP "\-\-proxy-tlsuser " -Same as \-\-tlsuser but used in HTTPS proxy context. +Same as \fI\-\-tlsuser\fP but used in HTTPS proxy context. Example: .nf curl --proxy-tlsuser smith -x https://proxy https://example.com .fi -See also \fI-x, --proxy\fP and \fI--proxy-tlspassword\fP. Added in 7.52.0. +Added in 7.52.0. .IP "\-\-proxy-tlsv1" -Same as \-\-tlsv1 but used in HTTPS proxy context. +Same as \fI\-1, \-\-tlsv1\fP but used in HTTPS proxy context. Example: .nf curl --proxy-tlsv1 -x https://proxy https://example.com .fi -See also \fI-x, --proxy\fP. Added in 7.52.0. +Added in 7.52.0. .IP "\-U, \-\-proxy-user " Specify the user name and password to use for proxy authentication. @@ -3168,8 +2908,8 @@ from your environment by specifying a single colon with this option: "-U :". On systems where it works, curl will hide the given option argument from process listings. This is not enough to protect credentials from possibly getting seen by other users on the same system as they will still be visible -for a moment before cleared. Such sensitive data should be retrieved from a -file instead or similar and never used in clear text in a command line. +for a brief moment before cleared. Such sensitive data should be retrieved +from a file instead or similar and never used in clear text in a command line. If this option is used several times, the last one will be used. @@ -3177,8 +2917,6 @@ Example: .nf curl --proxy-user name:pwd -x proxy https://example.com .fi - -See also \fI--proxy-pass\fP. .IP "\-x, \-\-proxy [protocol://]host[:port]" Use the specified proxy. @@ -3187,9 +2925,6 @@ specified or http:// will be treated as HTTP proxy. Use socks4://, socks4a://, socks5:// or socks5h:// to request a specific SOCKS version to be used. -Unix domain sockets are supported for socks proxy. Set localhost for the host -part. e.g. socks5h://localhost/path/to/socket.sock - HTTPS proxy support via https:// protocol prefix was added in 7.52.0 for OpenSSL, GnuTLS and NSS. @@ -3206,13 +2941,13 @@ use. If there\(aqs an environment variable setting a proxy, you can set proxy to All operations that are performed over an HTTP proxy will transparently be converted to HTTP. It means that certain protocol specific operations might not be available. This is not the case if you can tunnel through the proxy, as -one with the \-\-proxytunnel option. +one with the \fI\-p, \-\-proxytunnel\fP option. User and password that might be provided in the proxy string are URL decoded by curl. This allows you to pass in special characters such as @ by using %40 or pass in a colon with %3a. -The proxy host can be specified the same way as the proxy environment +The proxy host can be specified the exact same way as the proxy environment variables, including the protocol prefix (http://) and the embedded user + password. @@ -3222,8 +2957,6 @@ Example: .nf curl --proxy http://proxy.example https://example.com .fi - -See also \fI--socks5\fP and \fI--proxy-basic\fP. .IP "\-\-proxy1.0 " Use the specified HTTP 1.0 proxy. If the port number is not specified, it is assumed at port 1080. @@ -3236,8 +2969,6 @@ Example: .nf curl --proxy1.0 -x http://proxy https://example.com .fi - -See also \fI-x, --proxy\fP, \fI--socks5\fP and \fI--preproxy\fP. .IP "\-p, \-\-proxytunnel" When an HTTP proxy is used \fI\-x, \-\-proxy\fP, this option will make curl tunnel through the proxy. The tunnel approach is made with the HTTP proxy CONNECT request and @@ -3268,19 +2999,14 @@ Example: .nf curl --pubkey file.pub sftp://example.com/ .fi - -See also \fI--pass\fP. .IP "\-Q, \-\-quote " (FTP SFTP) Send an arbitrary command to the remote FTP or SFTP server. Quote commands are sent BEFORE the transfer takes place (just after the initial PWD command in an FTP transfer, to be exact). To make commands take place after a successful -transfer, prefix them with a dash \(aq-'. - -(FTP only) To make commands be sent after curl has changed the working -directory, just before the file transfer command(s), prefix the command with a -\(aq+'. This is not performed when a directory listing is performed. - -You may specify any number of commands. +transfer, prefix them with a dash \(aq-'. To make commands be sent after curl +has changed the working directory, just before the transfer command(s), prefix +the command with a \(aq+' (this is only supported for FTP). You may specify any +number of commands. By default curl will stop at first failure. To make curl continue even if the command fails, prefix the command with an asterisk (*). Otherwise, if the @@ -3293,8 +3019,8 @@ servers, or one of the commands listed below to SFTP servers. This option can be used multiple times. SFTP is a binary protocol. Unlike for FTP, curl interprets SFTP quote commands -itself before sending them to the server. File names may be quoted -shell-style to embed spaces or special characters. Following is the list of +itself before sending them to the server. File names may be quoted +shell-style to embed spaces or special characters. Following is the list of all supported SFTP quote commands: .RS .IP "atime date file" @@ -3339,21 +3065,15 @@ Example: .nf curl --quote "DELE file" ftp://example.com/foo .fi - -See also \fI-X, --request\fP. .IP "\-\-random-file " -Deprecated option. This option is ignored by curl since 7.84.0. Prior to that -it only had an effect on curl if built to use old versions of OpenSSL. - Specify the path name to file containing what will be considered as random -data. The data may be used to seed the random engine for SSL connections. +data. The data may be used to seed the random engine for SSL connections. See +also the \fI\-\-egd-file\fP option. Example: .nf curl --random-file rubbish https://example.com .fi - -See also \fI--egd-file\fP. .IP "\-r, \-\-range " (HTTP FTP SFTP FILE) Retrieve a byte range (i.e. a partial document) from an HTTP/1.1, FTP or SFTP server or a local FILE. Ranges can be specified in a number of ways. @@ -3401,41 +3121,6 @@ Example: .nf curl --range 22-44 https://example.com .fi - -See also \fI-C, --continue-at\fP and \fI-a, --append\fP. -.IP "\-\-rate " -Specify the maximum transfer frequency you allow curl to use \- in number of -transfer starts per time unit (sometimes called request rate). Without this -option, curl will start the next transfer as fast as possible. - -If given several URLs and a transfer completes faster than the allowed rate, -curl will wait until the next transfer is started to maintain the requested -rate. This option has no effect when \-\-parallel is used. - -The request rate is provided as "N/U" where N is an integer number and U is a -time unit. Supported units are \(aqs' (second), 'm' (minute), 'h' (hour) and 'd' -/(day, as in a 24 hour unit). The default time unit, if no "/U" is provided, -is number of transfers per hour. - -If curl is told to allow 10 requests per minute, it will not start the next -request until 6 seconds have elapsed since the previous transfer was started. - -This function uses millisecond resolution. If the allowed frequency is set -more than 1000 per second, it will instead run unrestricted. - -When retrying transfers, enabled with \fI\-\-retry\fP, the separate retry delay logic -is used and not this setting. - -If this option is used several times, the last one will be used. - -Examples: -.nf - curl --rate 2/s https://example.com - curl --rate 3/h https://example.com - curl --rate 14/m https://example.com -.fi - -See also \fI--limit-rate\fP and \fI--retry-delay\fP. Added in 7.84.0. .IP "\-\-raw" (HTTP) When used, it disables all internal HTTP decoding of content or transfer encodings and instead makes them passed on unaltered, raw. @@ -3444,12 +3129,10 @@ Example: .nf curl --raw https://example.com .fi - -See also \fI--tr-encoding\fP. .IP "\-e, \-\-referer " (HTTP) Sends the "Referrer Page" information to the HTTP server. This can also be set -with the \-\-header flag of course. When used with \-\-location you can append -";auto" to the \-\-referer URL to make curl automatically set the previous URL +with the \fI\-H, \-\-header\fP flag of course. When used with \fI\-L, \-\-location\fP you can append +";auto" to the \fI\-e, \-\-referer\fP URL to make curl automatically set the previous URL when it follows a Location: header. The \&";auto" string can be used alone, even if you do not set an initial \fI\-e, \-\-referer\fP. @@ -3464,16 +3147,11 @@ Examples: See also \fI-A, --user-agent\fP and \fI-H, --header\fP. .IP "\-J, \-\-remote-header-name" -(HTTP) This option tells the \-\-remote-name option to use the server-specified -Content-Disposition filename instead of extracting a filename from the URL. If -the server-provided file name contains a path, that will be stripped off -before the file name is used. - -The file is saved in the current directory, or in the directory specified with -\fI\-\-output-dir\fP. +(HTTP) This option tells the \fI\-O, \-\-remote-name\fP option to use the server-specified +Content-Disposition filename instead of extracting a filename from the URL. If the server specifies a file name and a file with that name already exists -in the destination directory, it will not be overwritten and an error will +in the current working directory it will not be overwritten and an error will occur. If the server does not specify a file name then this option has no effect. @@ -3481,38 +3159,34 @@ There\(aqs no attempt to decode %-sequences (yet) in the provided file name, so this option may provide you with rather unexpected file names. \fBWARNING\fP: Exercise judicious use of this option, especially on Windows. A -rogue server could send you the name of a DLL or other file that could be -loaded automatically by Windows or some third party software. +rogue server could send you the name of a DLL or other file that could possibly +be loaded automatically by Windows or some third party software. Example: .nf curl -OJ https://example.com/file .fi - -See also \fI-O, --remote-name\fP. .IP "\-\-remote-name-all" This option changes the default action for all given URLs to be dealt with as -if \-\-remote-name were used for each one. So if you want to disable that for a -specific URL after \-\-remote-name-all has been used, you must use "-o \-" or +if \fI\-O, \-\-remote-name\fP were used for each one. So if you want to disable that for a +specific URL after \fI\-\-remote-name-all\fP has been used, you must use "-o \-" or \-\-no-remote-name. Example: .nf curl --remote-name-all ftp://example.com/file1 ftp://example.com/file2 .fi - -See also \fI-O, --remote-name\fP. .IP "\-O, \-\-remote-name" Write output to a local file named like the remote file we get. (Only the file part of the remote file is used, the path is cut off.) The file will be saved in the current working directory. If you want the file saved in a different directory, make sure you change the current working -directory before invoking curl with this option or use \fI\-\-output-dir\fP. +directory before invoking curl with this option. The remote file name to use for saving is extracted from the given URL, nothing else, and if it already exists it will be overwritten. If you want the -server to be able to choose the file name refer to \-\-remote-header-name which +server to be able to choose the file name refer to \fI\-J, \-\-remote-header-name\fP which can be used in addition to this option. If the server chooses a file name and that name already exists it will not be overwritten. @@ -3525,8 +3199,6 @@ Example: .nf curl -O https://example.com/filename .fi - -See also \fI--remote-name-all\fP, \fI--output-dir\fP and \fI-J, --remote-header-name\fP. .IP "\-R, \-\-remote-time" When used, this will make curl attempt to figure out the timestamp of the remote file, and if that is available make the local file get that same @@ -3536,21 +3208,6 @@ Example: .nf curl --remote-time -o foo https://example.com .fi - -See also \fI-O, --remote-name\fP and \fI-z, --time-cond\fP. -.IP "\-\-remove-on-error" -When curl returns an error when told to save output in a local file, this -option removes that saved file before exiting. This prevents curl from -leaving a partial file in the case of an error during transfer. - -If the output is not a file, this option has no effect. - -Example: -.nf - curl --remove-on-error -o output https://example.com -.fi - -See also \fI-f, --fail\fP. Added in 7.83.0. .IP "\-\-request-target " (HTTP) Tells curl to use an alternative "target" (path) instead of using the path as provided in the URL. Particularly useful when wanting to issue HTTP requests @@ -3562,10 +3219,10 @@ Example: curl --request-target "*" -X OPTIONS https://example.com .fi -See also \fI-X, --request\fP. Added in 7.55.0. -.IP "\-X, \-\-request " +Added in 7.55.0. +.IP "\-X, \-\-request " (HTTP) Specifies a custom request method to use when communicating with the -HTTP server. The specified request method will be used instead of the method +HTTP server. The specified request method will be used instead of the method otherwise used (which defaults to GET). Read the HTTP 1.1 specification for details and explanations. Common additional HTTP requests include PUT and DELETE, but related technologies like WebDAV offers PROPFIND, COPY, MOVE and @@ -3576,10 +3233,10 @@ requests are rather invoked by using dedicated command line options. This option only changes the actual word used in the HTTP request, it does not alter the way curl behaves. So for example if you want to make a proper HEAD -request, using \-X HEAD will not suffice. You need to use the \-\-head option. +request, using \-X HEAD will not suffice. You need to use the \fI\-I, \-\-head\fP option. -The method string you set with \-\-request will be used for all requests, which -if you for example use \-\-location may cause unintended side-effects when curl +The method string you set with \fI\-X, \-\-request\fP will be used for all requests, which +if you for example use \fI\-L, \-\-location\fP may cause unintended side-effects when curl does not change request method according to the HTTP 30x response codes \- and similar. @@ -3604,8 +3261,6 @@ Examples: curl -X "DELETE" https://example.com curl -X NLST ftp://example.com/ .fi - -See also \fI--request-target\fP. .IP "\-\-resolve <[+]host:port:addr[,addr]...>" Provide a custom address for a specific host and port pair. Using this, you can make the curl requests(s) use a specified address and prevent the @@ -3616,10 +3271,10 @@ you need several entries if you want to provide address for the same host but different ports. By specifying \(aq*' as host you can tell curl to resolve any host and specific -port pair to the specified address. Wildcard is resolved last so any \-\-resolve +port pair to the specified address. Wildcard is resolved last so any \fI\-\-resolve\fP with a specific host and port will be used first. -The provided address set by this option will be used even if \-\-ipv4 or \-\-ipv6 +The provided address set by this option will be used even if \fI\-4, \-\-ipv4\fP or \fI\-6, \-\-ipv6\fP is set to make curl use another IP version. By prefixing the host with a \(aq+' you can make the entry time out after curl's @@ -3642,8 +3297,6 @@ Example: .nf curl --resolve example.com:443:127.0.0.1 https://example.com .fi - -See also \fI--connect-to\fP and \fI--alt-svc\fP. .IP "\-\-retry-all-errors" Retry on any error. This option is used together with \fI\-\-retry\fP. @@ -3665,17 +3318,17 @@ duplicate data. By default curl will not error on an HTTP response code that indicates an HTTP error, if the transfer was successful. For example, if a server replies 404 Not Found and the reply is fully received then that is not an error. When -\-\-retry is used then curl will retry on some HTTP response codes that indicate +\fI\-\-retry\fP is used then curl will retry on some HTTP response codes that indicate transient HTTP errors, but that does not include most 4xx response codes such as 404. If you want to retry on all response codes that indicate HTTP errors (4xx and 5xx) then combine with \fI\-f, \-\-fail\fP. Example: .nf - curl --retry 5 --retry-all-errors https://example.com + curl --retry-all-errors https://example.com .fi -See also \fI--retry\fP. Added in 7.71.0. +Added in 7.71.0. .IP "\-\-retry-connrefused" In addition to the other conditions, consider ECONNREFUSED as a transient error too for \fI\-\-retry\fP. This option is used together with \-\-retry. @@ -3685,11 +3338,11 @@ Example: curl --retry-connrefused --retry https://example.com .fi -See also \fI--retry\fP and \fI--retry-all-errors\fP. Added in 7.52.0. +Added in 7.52.0. .IP "\-\-retry-delay " Make curl sleep this amount of time before each retry when a transfer has failed with a transient error (it changes the default backoff time algorithm -between retries). This option is only interesting if \-\-retry is also +between retries). This option is only interesting if \fI\-\-retry\fP is also used. Setting this delay to zero will make curl use the default backoff time. If this option is used several times, the last one will be used. @@ -3698,14 +3351,12 @@ Example: .nf curl --retry-delay 5 --retry https://example.com .fi - -See also \fI--retry\fP. .IP "\-\-retry-max-time " The retry timer is reset before the first transfer attempt. Retries will be done as usual (see \fI\-\-retry\fP) as long as the timer has not reached this given limit. Notice that if the timer has not reached the limit, the request will be made and while performing, it may take longer than this given time period. To -limit a single request\(aqs maximum time, use \fI\-m, \-\-max-time\fP. Set this option to +limit a single request\(aqs maximum time, use \fI\-m, \-\-max-time\fP. Set this option to zero to not timeout retries. If this option is used several times, the last one will be used. @@ -3714,8 +3365,6 @@ Example: .nf curl --retry-max-time 30 --retry 10 https://example.com .fi - -See also \fI--retry\fP. .IP "\-\-retry " If a transient error is returned when curl tries to perform a transfer, it will retry this number of times before giving up. Setting the number to 0 @@ -3725,9 +3374,9 @@ response code. When curl is about to retry a transfer, it will first wait one second and then for all forthcoming retries it will double the waiting time until it reaches -10 minutes which then will be the delay between the rest of the retries. By -using \-\-retry-delay you disable this exponential backoff algorithm. See also -\-\-retry-max-time to limit the total time allowed for retries. +10 minutes which then will be the delay between the rest of the retries. By +using \fI\-\-retry-delay\fP you disable this exponential backoff algorithm. See also +\fI\-\-retry-max-time\fP to limit the total time allowed for retries. Since curl 7.66.0, curl will comply with the Retry-After: response header if one was present to know when to issue the next retry. @@ -3738,10 +3387,8 @@ Example: .nf curl --retry 7 https://example.com .fi - -See also \fI--retry-max-time\fP. .IP "\-\-sasl-authzid " -Use this authorization identity (authzid), during SASL PLAIN authentication, +Use this authorisation identity (authzid), during SASL PLAIN authentication, in addition to the authentication identity (authcid) as specified by \fI\-u, \-\-user\fP. If the option is not specified, the server will derive the authzid from the @@ -3754,7 +3401,7 @@ Example: curl --sasl-authzid zid imap://example.com/ .fi -See also \fI--login-options\fP. Added in 7.66.0. +Added in 7.66.0. .IP "\-\-sasl-ir" Enable initial response in SASL authentication. @@ -3763,18 +3410,18 @@ Example: curl --sasl-ir imap://example.com/ .fi -See also \fI--sasl-authzid\fP. Added in 7.31.0. +Added in 7.31.0. .IP "\-\-service-name " This option allows you to change the service name for SPNEGO. -Examples: \fI\-\-negotiate\fP \-\-service-name sockd would use sockd/server-name. +Examples: \fI\-\-negotiate\fP \fI\-\-service-name\fP sockd would use sockd/server-name. Example: .nf curl --service-name sockd/server https://example.com .fi -See also \fI--negotiate\fP and \fI--proxy-service-name\fP. Added in 7.43.0. +Added in 7.43.0. .IP "\-S, \-\-show-error" When used with \fI\-s, \-\-silent\fP, it makes curl show an error message if it fails. @@ -3788,11 +3435,11 @@ Example: See also \fI--no-progress-meter\fP. .IP "\-s, \-\-silent" -Silent or quiet mode. Do not show progress meter or error messages. Makes Curl +Silent or quiet mode. Do not show progress meter or error messages. Makes Curl mute. It will still output the data you ask for, potentially even to the terminal/stdout unless you redirect it. -Use \-\-show-error in addition to this option to disable progress meter but +Use \fI\-S, \-\-show-error\fP in addition to this option to disable progress meter but still show error messages. Example: @@ -3806,17 +3453,14 @@ Use the specified SOCKS4 proxy. If the port number is not specified, it is assumed at port 1080. Using this socket type make curl resolve the host name and passing the address on to the proxy. -To specify proxy on a unix domain socket, use localhost for host, e.g. -socks4://localhost/path/to/socket.sock - This option overrides any previous use of \fI\-x, \-\-proxy\fP, as they are mutually exclusive. -This option is superfluous since you can specify a socks4 proxy with \-\-proxy +This option is superfluous since you can specify a socks4 proxy with \fI\-x, \-\-proxy\fP using a socks4:// protocol prefix. -Since 7.52.0, \-\-preproxy can be used to specify a SOCKS proxy at the same time -\-\-proxy is used with an HTTP/HTTPS proxy. In such a case curl first connects to +Since 7.52.0, \fI\-\-preproxy\fP can be used to specify a SOCKS proxy at the same time +\fI\-x, \-\-proxy\fP is used with an HTTP/HTTPS proxy. In such a case curl first connects to the SOCKS proxy and then connects (through SOCKS) to the HTTP or HTTPS proxy. If this option is used several times, the last one will be used. @@ -3825,23 +3469,18 @@ Example: .nf curl --socks4 hostname:4096 https://example.com .fi - -See also \fI--socks4a\fP, \fI--socks5\fP and \fI--socks5-hostname\fP. .IP "\-\-socks4a " Use the specified SOCKS4a proxy. If the port number is not specified, it is assumed at port 1080. This asks the proxy to resolve the host name. -To specify proxy on a unix domain socket, use localhost for host, e.g. -socks4a://localhost/path/to/socket.sock - This option overrides any previous use of \fI\-x, \-\-proxy\fP, as they are mutually exclusive. -This option is superfluous since you can specify a socks4a proxy with \-\-proxy +This option is superfluous since you can specify a socks4a proxy with \fI\-x, \-\-proxy\fP using a socks4a:// protocol prefix. -Since 7.52.0, \-\-preproxy can be used to specify a SOCKS proxy at the same time -\-\-proxy is used with an HTTP/HTTPS proxy. In such a case curl first connects to +Since 7.52.0, \fI\-\-preproxy\fP can be used to specify a SOCKS proxy at the same time +\fI\-x, \-\-proxy\fP is used with an HTTP/HTTPS proxy. In such a case curl first connects to the SOCKS proxy and then connects (through SOCKS) to the HTTP or HTTPS proxy. If this option is used several times, the last one will be used. @@ -3850,37 +3489,33 @@ Example: .nf curl --socks4a hostname:4096 https://example.com .fi - -See also \fI--socks4\fP, \fI--socks5\fP and \fI--socks5-hostname\fP. .IP "\-\-socks5-basic" Tells curl to use username/password authentication when connecting to a SOCKS5 proxy. The username/password authentication is enabled by default. Use -\-\-socks5-gssapi to force GSS-API authentication to SOCKS5 proxies. +\fI\-\-socks5-gssapi\fP to force GSS-API authentication to SOCKS5 proxies. Example: .nf curl --socks5-basic --socks5 hostname:4096 https://example.com .fi -See also \fI--socks5\fP. Added in 7.55.0. +Added in 7.55.0. .IP "\-\-socks5-gssapi-nec" As part of the GSS-API negotiation a protection mode is negotiated. RFC 1961 says in section 4.3/4.4 it should be protected, but the NEC reference -implementation does not. The option \-\-socks5-gssapi-nec allows the +implementation does not. The option \fI\-\-socks5-gssapi-nec\fP allows the unprotected exchange of the protection mode negotiation. Example: .nf curl --socks5-gssapi-nec --socks5 hostname:4096 https://example.com .fi - -See also \fI--socks5\fP. .IP "\-\-socks5-gssapi-service " The default service name for a socks server is rcmd/server-fqdn. This option allows you to change it. -Examples: \-\-socks5 proxy-name \-\-socks5-gssapi-service sockd would use -sockd/proxy-name \-\-socks5 proxy-name \-\-socks5-gssapi-service sockd/real-name +Examples: \fI\-\-socks5\fP proxy-name \fI\-\-socks5-gssapi-service\fP sockd would use +sockd/proxy-name \fI\-\-socks5\fP proxy-name \fI\-\-socks5-gssapi-service\fP sockd/real-name would use sockd/real-name for cases where the proxy-name does not match the principal name. @@ -3888,12 +3523,10 @@ Example: .nf curl --socks5-gssapi-service sockd --socks5 hostname:4096 https://example.com .fi - -See also \fI--socks5\fP. .IP "\-\-socks5-gssapi" Tells curl to use GSS-API authentication when connecting to a SOCKS5 proxy. The GSS-API authentication is enabled by default (if curl is compiled with -GSS-API support). Use \-\-socks5-basic to force username/password authentication +GSS-API support). Use \fI\-\-socks5-basic\fP to force username/password authentication to SOCKS5 proxies. Example: @@ -3901,22 +3534,19 @@ Example: curl --socks5-gssapi --socks5 hostname:4096 https://example.com .fi -See also \fI--socks5\fP. Added in 7.55.0. +Added in 7.55.0. .IP "\-\-socks5-hostname " Use the specified SOCKS5 proxy (and let the proxy resolve the host name). If the port number is not specified, it is assumed at port 1080. -To specify proxy on a unix domain socket, use localhost for host, e.g. -socks5h://localhost/path/to/socket.sock - This option overrides any previous use of \fI\-x, \-\-proxy\fP, as they are mutually exclusive. This option is superfluous since you can specify a socks5 hostname proxy with -\-\-proxy using a socks5h:// protocol prefix. +\fI\-x, \-\-proxy\fP using a socks5h:// protocol prefix. -Since 7.52.0, \-\-preproxy can be used to specify a SOCKS proxy at the same time -\-\-proxy is used with an HTTP/HTTPS proxy. In such a case curl first connects to +Since 7.52.0, \fI\-\-preproxy\fP can be used to specify a SOCKS proxy at the same time +\fI\-x, \-\-proxy\fP is used with an HTTP/HTTPS proxy. In such a case curl first connects to the SOCKS proxy and then connects (through SOCKS) to the HTTP or HTTPS proxy. If this option is used several times, the last one will be used. @@ -3925,23 +3555,18 @@ Example: .nf curl --socks5-hostname proxy.example:7000 https://example.com .fi - -See also \fI--socks5\fP and \fI--socks4a\fP. .IP "\-\-socks5 " Use the specified SOCKS5 proxy \- but resolve the host name locally. If the port number is not specified, it is assumed at port 1080. -To specify proxy on a unix domain socket, use localhost for host, e.g. -socks5://localhost/path/to/socket.sock - This option overrides any previous use of \fI\-x, \-\-proxy\fP, as they are mutually exclusive. -This option is superfluous since you can specify a socks5 proxy with \-\-proxy +This option is superfluous since you can specify a socks5 proxy with \fI\-x, \-\-proxy\fP using a socks5:// protocol prefix. -Since 7.52.0, \-\-preproxy can be used to specify a SOCKS proxy at the same time -\-\-proxy is used with an HTTP/HTTPS proxy. In such a case curl first connects to +Since 7.52.0, \fI\-\-preproxy\fP can be used to specify a SOCKS proxy at the same time +\fI\-x, \-\-proxy\fP is used with an HTTP/HTTPS proxy. In such a case curl first connects to the SOCKS proxy and then connects (through SOCKS) to the HTTP or HTTPS proxy. If this option is used several times, the last one will be used. @@ -3952,11 +3577,9 @@ Example: .nf curl --socks5 proxy.example:7000 https://example.com .fi - -See also \fI--socks5-hostname\fP and \fI--socks4a\fP. .IP "\-Y, \-\-speed-limit " -If a transfer is slower than this given speed (in bytes per second) for -speed-time seconds it gets aborted. speed-time is set with \-\-speed-time and is +If a download is slower than this given speed (in bytes per second) for +speed-time seconds it gets aborted. speed-time is set with \fI\-y, \-\-speed-time\fP and is 30 if not set. If this option is used several times, the last one will be used. @@ -3965,15 +3588,13 @@ Example: .nf curl --speed-limit 300 --speed-time 10 https://example.com .fi - -See also \fI-y, --speed-time\fP, \fI--limit-rate\fP and \fI-m, --max-time\fP. .IP "\-y, \-\-speed-time " -If a transfer runs slower than speed-limit bytes per second during a speed-time -period, the transfer is aborted. If speed-time is used, the default +If a download is slower than speed-limit bytes per second during a speed-time +period, the download gets aborted. If speed-time is used, the default speed-limit will be 1 unless set with \fI\-Y, \-\-speed-limit\fP. -This option controls transfers (in both directions) but will not affect slow -connects etc. If this is a concern for you, try the \-\-connect-timeout option. +This option controls transfers and thus will not affect slow connects etc. If +this is a concern for you, try the \fI\-\-connect-timeout\fP option. If this option is used several times, the last one will be used. @@ -3981,8 +3602,6 @@ Example: .nf curl --speed-limit 300 --speed-time 10 https://example.com .fi - -See also \fI-Y, --speed-limit\fP and \fI--limit-rate\fP. .IP "\-\-ssl-allow-beast" This option tells curl to not work around a security flaw in the SSL3 and TLS1.0 protocols known as BEAST. If this option is not used, the SSL layer @@ -3996,8 +3615,6 @@ Example: .nf curl --ssl-allow-beast https://example.com .fi - -See also \fI--proxy-ssl-allow-beast\fP and \fI-k, --insecure\fP. .IP "\-\-ssl-auto-client-cert" Tell libcurl to automatically locate and use a client certificate for authentication, when requested by the server. This option is only supported @@ -4022,23 +3639,17 @@ Example: curl --ssl-no-revoke https://example.com .fi -See also \fI--crlfile\fP. Added in 7.44.0. +Added in 7.44.0. .IP "\-\-ssl-reqd" -(FTP IMAP POP3 SMTP LDAP) Require SSL/TLS for the connection. Terminates the connection if the server +(FTP IMAP POP3 SMTP) Require SSL/TLS for the connection. Terminates the connection if the server does not support SSL/TLS. -This option is handled in LDAP since version 7.81.0. It is fully supported -by the openldap backend and rejected by the generic ldap backend if explicit -TLS is required. - This option was formerly known as \-\-ftp-ssl-reqd. Example: .nf curl --ssl-reqd ftp://example.com .fi - -See also \fI--ssl\fP and \fI-k, --insecure\fP. .IP "\-\-ssl-revoke-best-effort" (Schannel) This option tells curl to ignore certificate revocation checks when they failed due to missing/offline distribution points for the revocation check @@ -4049,18 +3660,12 @@ Example: curl --ssl-revoke-best-effort https://example.com .fi -See also \fI--crlfile\fP and \fI-k, --insecure\fP. Added in 7.70.0. +Added in 7.70.0. .IP "\-\-ssl" -(FTP IMAP POP3 SMTP LDAP) Try to use SSL/TLS for the connection. Reverts to a non-secure connection if -the server does not support SSL/TLS. See also \-\-ftp-ssl-control and \-\-ssl-reqd +(FTP IMAP POP3 SMTP) Try to use SSL/TLS for the connection. Reverts to a non-secure connection if +the server does not support SSL/TLS. See also \fI\-\-ftp-ssl-control\fP and \fI\-\-ssl-reqd\fP for different levels of encryption required. -This option is handled in LDAP since version 7.81.0. It is fully supported -by the openldap backend and ignored by the generic ldap backend. - -Please note that a server may close the connection if the negotiation does -not succeed. - This option was formerly known as \-\-ftp-ssl. That option name can still be used but will be removed in a future version. @@ -4068,8 +3673,6 @@ Example: .nf curl --ssl pop3://example.com/ .fi - -See also \fI-k, --insecure\fP and \fI--ciphers\fP. .IP "\-2, \-\-sslv2" (SSL) This option previously asked curl to use SSLv2, but starting in curl 7.77.0 this instruction is ignored. SSLv2 is widely considered insecure (see RFC @@ -4080,7 +3683,7 @@ Example: curl --sslv2 https://example.com .fi -See also \fI--http1.1\fP and \fI--http2\fP. \fI-2, --sslv2\fP requires that the underlying libcurl was built to support TLS. This option is mutually exclusive to \fI-3, --sslv3\fP and \fI-1, --tlsv1\fP and \fI--tlsv1.1\fP and \fI--tlsv1.2\fP. +See also \fI--http1.1\fP and \fI--http2\fP. \fI-2, --sslv2\fP requires that the underlying libcurl was built to support TLS. This option overrides \fI-3, --sslv3\fP and \fI-1, --tlsv1\fP and \fI--tlsv1.1\fP and \fI--tlsv1.2\fP. .IP "\-3, \-\-sslv3" (SSL) This option previously asked curl to use SSLv3, but starting in curl 7.77.0 this instruction is ignored. SSLv3 is widely considered insecure (see RFC @@ -4091,7 +3694,7 @@ Example: curl --sslv3 https://example.com .fi -See also \fI--http1.1\fP and \fI--http2\fP. \fI-3, --sslv3\fP requires that the underlying libcurl was built to support TLS. This option is mutually exclusive to \fI-2, --sslv2\fP and \fI-1, --tlsv1\fP and \fI--tlsv1.1\fP and \fI--tlsv1.2\fP. +See also \fI--http1.1\fP and \fI--http2\fP. \fI-3, --sslv3\fP requires that the underlying libcurl was built to support TLS. This option overrides \fI-2, --sslv2\fP and \fI-1, --tlsv1\fP and \fI--tlsv1.1\fP and \fI--tlsv1.2\fP. .IP "\-\-stderr " Redirect all writes to stderr to the specified file instead. If the file name is a plain \(aq-', it is instead written to stdout. @@ -4119,12 +3722,12 @@ Example: curl --styled-output -I https://example.com .fi -See also \fI-I, --head\fP and \fI-v, --verbose\fP. Added in 7.61.0. +Added in 7.61.0. .IP "\-\-suppress-connect-headers" -When \-\-proxytunnel is used and a CONNECT request is made do not output proxy -CONNECT response headers. This option is meant to be used with \-\-dump-header or -\-\-include which are used to show protocol headers in the output. It has no -effect on debug options such as \-\-verbose or \fI\-\-trace\fP, or any statistics. +When \fI\-p, \-\-proxytunnel\fP is used and a CONNECT request is made do not output proxy +CONNECT response headers. This option is meant to be used with \fI\-D, \-\-dump-header\fP or +\fI\-i, \-\-include\fP which are used to show protocol headers in the output. It has no +effect on debug options such as \fI\-v, \-\-verbose\fP or \fI\-\-trace\fP, or any statistics. Example: .nf @@ -4140,7 +3743,7 @@ Example: curl --tcp-fastopen https://example.com .fi -See also \fI--false-start\fP. Added in 7.49.0. +Added in 7.49.0. .IP "\-\-tcp-nodelay" Turn on the TCP_NODELAY option. See the \fIcurl_easy_setopt(3)\fP man page for details about this option. @@ -4152,8 +3755,6 @@ Example: .nf curl --tcp-nodelay https://example.com .fi - -See also \fI-N, --no-buffer\fP. .IP "\-t, \-\-telnet-option " Pass options to the telnet protocol. Supported options are: @@ -4167,8 +3768,6 @@ Example: .nf curl -t TTYPE=vt100 telnet://example.com/ .fi - -See also \fI-K, --config\fP. .IP "\-\-tftp-blksize " (TFTP) Set TFTP BLKSIZE option (must be >512). This is the block size that curl will try to use when transferring data to or from a TFTP server. By default 512 @@ -4180,13 +3779,11 @@ Example: .nf curl --tftp-blksize 1024 tftp://example.com/file .fi - -See also \fI--tftp-no-options\fP. .IP "\-\-tftp-no-options" (TFTP) Tells curl not to send TFTP options requests. This option improves interop with some legacy servers that do not acknowledge -or properly implement TFTP options. When this option is used \-\-tftp-blksize is +or properly implement TFTP options. When this option is used \fI\-\-tftp-blksize\fP is ignored. Example: @@ -4194,7 +3791,7 @@ Example: curl --tftp-no-options tftp://192.168.0.1/ .fi -See also \fI--tftp-blksize\fP. Added in 7.48.0. +Added in 7.48.0. .IP "\-z, \-\-time-cond