| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
| |
* upstream-curl:
curl 2016-08-03 (f2cb3a01)
|
| |
|
|
|
|
|
| |
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.
|
| |
|
|
|
| |
Defining curl APIs as forwarding macros triggers Clang warnings
with -Wdisabled-macro-expansion. Skip this sanity check.
|
| |
|
|
|
|
| |
Use a CMake-specific path to this configured header so that it works
when included from a CMake source file in addition to curl sources.
We do not install the Curl headers with CMake, so this hack is okay.
|
| |
|
|
|
|
|
| |
Re-apply change from commit v2.8.0~1683 (add initial support for HAIKU
OS, 2008-09-15) on updated upstream curl. However, leave out the part
that was reverted by commit v3.0.0-rc1~541^2~1 (Haiku: Remove outdated
preprocessor checks, 2013-10-05).
|
| |
|
|
|
| |
Resolve all conflicts in favor of the upstream side.
We can re-apply specific changes later.
|
|
|
Update our build files as needed to compensate.
|
