Commit Graph

58 Commits

Author SHA1 Message Date
Clemens Wasser
a8d91e2719 curl: Precompile common expensive headers 2023-06-22 18:11:45 +02:00
Brad King
a6c9b53273 Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2023-05-30 (7ab9d437)
2023-05-30 09:39:43 -04:00
Brad King
e3dc4df9b9 Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2023-03-20 (b16d1fa8)
2023-03-20 16:40:49 -04:00
Brad King
ce1550f178 Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2023-02-20 (046209e5)
2023-02-21 10:04:36 -05:00
Brad King
0d312728eb curl: Backport upstream fix for SecureTransport on macOS
Backport upstream curl commit `16bb32e104d` (sectransp: fix for
incomplete read/writes, 2023-01-05) to fix TLS support on macOS.

Fixes: #24398
2023-02-09 16:54:25 -05:00
Brad King
8675d8bdb0 curl: Enable schannel TLS 1.3 support on Windows 11
Revert commit c0a4536cec (curl: Disable schannel TLS 1.3 support on
Windows 11, 2022-11-09, v3.25.0~13^2).  The curl bug it avoided was
fixed by upstream curl commit `4f42150d0` (sendf: change Curl_read_plain
to wrap Curl_recv_plain , 2022-11-14, curl-7_87_0~129), which we have
since recently updating to curl 7.87.0.

Issue: #24147
2023-02-08 14:55:24 -05:00
Brad King
8443dfa946 curl: Work around missing OpenSSL symbol on machine with LCC 1.23
On a nightly build using LCC 1.23, OpenSSL 2.0.0 is found but does
not seem to have the `X509_STORE_up_ref` symbol used by curl 7.87.
Pending further investigation, disable use of the symbol based on
the compiler version.
2023-01-30 08:22:02 -05:00
Brad King
f9f5957884 Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2022-12-21 (c12fb3dd)
2023-01-27 15:58:44 -05:00
Brad King
c0a4536cec curl: Disable schannel TLS 1.3 support on Windows 11
Curl 7.85.0 introduced support for TLS 1.3 support with schannel.
We've observed connection failures in some cases, so disable the
support pending further investigation.

Fixes: #24147
2022-11-09 17:05:39 -05:00
Brad King
9ffe6b0969 Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2022-10-26 (cd95ee9f)
2022-10-31 16:11:41 -04:00
Alex Turbov
2be5a7de4e Build: Use imported target ZLIB::ZLIB instead of variables 2022-09-22 10:20:30 -04:00
makise-homura
de16db0f64 curl: make libcmcurl buildable with old LibreSSL
LibreSSL older than 2.6.0 is not supported correctly
in upstream curl, and as a consequence, in libcmcurl.
Such LibreSSL versions can be used in old distros,
like OS Elbrus 4.x and 5.x, so until this fix, CMake
wasn't buildable there either.
2022-06-28 11:12:04 -04:00
Brad King
71747a28ea Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2022-05-11 (462196e6)
2022-05-16 11:43:51 -04:00
Brad King
30aba1ce8c Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2022-04-27 (1669b17d)
2022-04-28 15:21:23 -04:00
Brad King
9341e63233 curl: Set build options the way we need for CMake 2022-01-07 11:42:30 -05:00
Brad King
697e8871a1 Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2022-01-05 (801bd513)
2022-01-07 11:41:57 -05:00
Brad King
5b117bddd0 Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2021-09-22 (c7aef0a9)
2021-09-24 10:04:49 -04:00
Brad King
8ecd95845c Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2021-09-14 (8e82f2a0)
2021-09-15 15:28:38 -04:00
Brad King
3faa3d3a38 curl: backport upstream fix to 7.77.0 regression
Backport upstream curl commit `ee97f1769` (schannel: set ALPN length
correctly for HTTP/2, 2021-05-26) to get a fix to curl issue 7138,
a regression in 7.77.0.

Fixes: #22355
2021-06-28 12:59:23 -04:00
Brad King
cd40922edb Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2021-05-26 (6b951a69)
2021-05-27 15:23:20 -04:00
Brad King
426ef61cc8 Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2021-02-03 (2f33be81)
2021-02-03 11:55:06 -05:00
Brad King
54931fdff0 Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2020-12-09 (e0528597)
2020-12-09 11:45:25 -05:00
Brad King
7d0fa4a943 Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2020-08-19 (9d954e49)
2020-08-19 12:50:05 -04:00
Brad King
6d423195d5 Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2020-06-30 (5a1fc8d3)
2020-07-01 10:10:23 -04:00
Brad King
0ef8fa5000 Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2020-06-23 (e9db32a0)
2020-06-24 08:13:02 -04:00
Brad King
1dd785b02c curl: Use KWIML to get integer type sizes 2020-06-02 07:00:35 -04:00
Brad King
a24dd93e93 curl: When building inside CMake, link dependencies as PRIVATE 2020-04-03 06:43:00 -04:00
Brad King
d61c3bd505 Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2020-03-04 (b8d13668)
2020-03-04 14:34:39 -05:00
Brad King
a39138ef9a Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2019-05-22 (885ce314)
2019-05-22 14:15:06 -04:00
Brad King
c1ad5118de curl: backport upstream fix to 7.62.0 regression
Backport upstream curl commit 2c5ec339ea (Curl_follow: accept
non-supported schemes for "fake" redirects, 2018-11-01) to get
a fix to curl issue 3210, a regression in 7.62.0.
2018-11-02 08:14:12 -04:00
Brad King
636bcefeab Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2018-10-30 (19667715)
2018-10-31 09:46:23 -04:00
Brad King
ec13ba36b5 Merge branch 'update-curl' into release-3.13
Merge-request: !2509
2018-10-22 12:55:14 -04:00
Brad King
3dc484e531 curl: add missing type sizes for 'long long' and '__int64'
When generating `curl_config.h`, add size information for `long long`
and `__int64` types.  These are needed as candidates for defining the
`ssize_t` type because on MSVC, `long` is not the same size as `size_t`.

This problem did not affect upstream curl because it computes the
`ssize_t` type in CMake code where all sizes are available.  CMake's
port computes it in preprocessor logic because universal binaries on
macOS do not know type sizes until compile time.

Fixes: #18477
2018-10-22 12:02:38 -04:00
Brad King
e9e8dcee6b Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2018-09-04 (432eb5f5)
2018-10-22 08:48:58 -04:00
Brad King
3e913b819d Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2018-05-15 (cb013830)
2018-05-18 10:16:50 -04:00
Brad King
cd8e31a1bf Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2018-01-23 (d6c21c8e)
2018-01-24 14:18:16 -05:00
Brad King
bb7591487d curl: Update build within CMake to account for 7.56 changes 2017-10-10 11:15:20 -04:00
Brad King
9e3ef40edb Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2017-10-04 (3ea76790)
2017-10-10 11:15:16 -04:00
Brad King
a3ef36f153 Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2017-06-14 (54b636f1)

Resolve a logical conflict in `Utilities/cmcurl/CMakeLists.txt`
by disabling CA bundle/path detection for build within CMake.
CMake already handles locating a CA bundle/path at runtime.
2017-06-14 11:10:22 -04:00
Brad King
299975908a Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2017-04-19 (d957e218)

Resolve conflicts in `CMakeLists.txt` in favor of the upstream version.
We will re-apply our logic as needed in following commits.
2017-05-11 11:27:21 -04:00
Brad King
1df9d5f919 Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2016-12-22 (44b9b4d4)
2017-02-07 11:38:00 -05:00
Brad King
f8a1ba202f Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2016-11-02 (3c561c65)
2016-12-05 11:50:43 -05:00
Brad King
4b53a693bd curl: Backport certificate reuse fix from 7.50.2
Backport curl upstream commit curl-7_50_2~32 (nss: refuse previously
loaded certificate from file, 2016-08-22).
2016-09-07 08:46:42 -04:00
Brad King
f53f4a8a2d Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2016-08-03 (f2cb3a01)
2016-08-03 14:26:53 -04:00
Felix Geyer
49e82c15d5 Fix spelling typos in comments and documentation (#16037)
The Debian package checker tool (lintian) detected several typos in
CMake.
2016-03-29 14:31:02 -04:00
Brad King
91e8d35ab8 Merge branch 'curl-upstream' into update-curl
Resolve conflicts by taking upstream side when possible and otherwise
integrating the changes from both sides.  Be carful in CMakeLists.txt
where the OPENSSL code block that we modified previously has moved, and
preserve our previous modifications in the new location.
2015-08-12 15:43:52 -04:00
Brad King
6ce346c53c curl: Add CURL_CA_PATH option to CMake build process
Move CMAKE_USE_OPENSSL and CURL_CA_BUNDLE up to the top of CMake so that
CMake's own sources can know their values.  Add the CURL_CA_PATH option
at the top and honor it as part of the curl build.
2015-01-23 08:23:52 -05:00
Brad King
3dd26463d4 curl: Disable warnings to avoid changing 3rd party code
Tell MSVC to use its lowest warning level inside curl sources.
2014-11-11 08:58:01 -05:00
Brad King
54cb23c657 curl: Restore installation of OpenSSL DLLs
Restore logic originally added by commit v2.8.10~119^2~1 (curl: Make
OpenSSL DLLs available to CMake on Windows, 2012-09-06).
2014-11-10 10:13:38 -05:00
Brad King
1959304295 curl: Configure build to work within CMake
Set curl build options as needed for CMake rather than presenting them
to the user in the cache.  Drop the CMAKE_BUILD_CURL_SHARED option for
now.

Change the curl library name to 'cmcurl'.  Disable blocks of code within
curl CMakeLists.txt files that we do not need for CMake, but leave the
code in place to make merging with curl updates easier.
2014-11-10 10:13:37 -05:00