| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
| |
* upstream-curl:
curl 2024-01-31 (5ce164e0)
|
| |
|
|
|
| |
* upstream-curl:
curl 2023-12-06 (7161cb17)
|
| |
|
|
|
| |
* upstream-curl:
curl 2023-02-20 (046209e5)
|
| |
|
|
|
| |
* upstream-curl:
curl 2022-10-26 (cd95ee9f)
|
| |
|
|
|
| |
* upstream-curl:
curl 2020-12-09 (e0528597)
|
| |
|
|
|
| |
* upstream-curl:
curl 2020-06-23 (e9db32a0)
|
| |
|
|
|
| |
* upstream-curl:
curl 2018-09-04 (432eb5f5)
|
| |
|
|
|
| |
* upstream-curl:
curl 2017-10-04 (3ea76790)
|
| |
|
|
|
|
|
| |
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.
|
| |
|
|
|
|
| |
Restore the check_include_file_concat functionality broken
in upstream curl. The <net/if.h> header on older OS X versions
depends on <sys/socket.h> begin included first, for example.
|
| |
|
|
|
|
|
|
|
|
|
| |
Remove use of an old hack that takes advantage of the auto-dereference
behavior of the if() command to detect if a variable is defined. The
hack has the form:
if("${VAR} MATCHES "^${VAR}$")
where "${VAR}" is a macro argument reference. Use if(DEFINED) instead.
This also avoids warnings for CMake Policy CMP0054.
|
|
|
Resolve all conflicts in favor of the upstream side.
We can re-apply specific changes later.
|
