summaryrefslogtreecommitdiff
path: root/Utilities/cmcurl/include/curl/curl.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'upstream-curl' into update-curlBrad King2022-10-311-17/+60
| | | | | * upstream-curl: curl 2022-10-26 (cd95ee9f)
* Merge branch 'upstream-curl' into update-curlBrad King2022-04-281-22/+10
| | | | | * upstream-curl: curl 2022-04-27 (1669b17d)
* Merge branch 'upstream-curl' into update-curlBrad King2022-01-071-3/+39
| | | | | * upstream-curl: curl 2022-01-05 (801bd513)
* Merge branch 'upstream-curl' into update-curlBrad King2021-09-151-9/+10
| | | | | * upstream-curl: curl 2021-09-14 (8e82f2a0)
* Merge branch 'upstream-curl' into update-curlBrad King2021-05-271-8/+37
| | | | | * upstream-curl: curl 2021-05-26 (6b951a69)
* Merge branch 'upstream-curl' into update-curlBrad King2021-02-031-3/+11
| | | | | * upstream-curl: curl 2021-02-03 (2f33be81)
* Merge branch 'upstream-curl' into update-curlBrad King2020-12-091-44/+149
| | | | | * upstream-curl: curl 2020-12-09 (e0528597)
* Merge branch 'upstream-curl' into update-curlBrad King2020-08-191-6/+11
| | | | | * upstream-curl: curl 2020-08-19 (9d954e49)
* Merge branch 'upstream-curl' into update-curlBrad King2020-07-011-3/+3
| | | | | * upstream-curl: curl 2020-06-30 (5a1fc8d3)
* Merge branch 'upstream-curl' into update-curlBrad King2020-06-241-10/+40
| | | | | * upstream-curl: curl 2020-06-23 (e9db32a0)
* Merge branch 'upstream-curl' into update-curlBrad King2020-03-041-370/+392
| | | | | * upstream-curl: curl 2020-03-04 (b8d13668)
* Merge branch 'upstream-curl' into update-curlBrad King2019-05-221-8/+58
| | | | | * upstream-curl: curl 2019-05-22 (885ce314)
* Merge branch 'upstream-curl' into update-curlBrad King2018-10-311-4/+21
| | | | | * upstream-curl: curl 2018-10-30 (19667715)
* Merge branch 'upstream-curl' into update-curlBrad King2018-10-221-1/+21
| | | | | * upstream-curl: curl 2018-09-04 (432eb5f5)
* Merge branch 'upstream-curl' into update-curlBrad King2018-05-181-3/+32
| | | | | * upstream-curl: curl 2018-05-15 (cb013830)
* Merge branch 'upstream-curl' into update-curlBrad King2018-01-241-4/+15
| | | | | * upstream-curl: curl 2018-01-23 (d6c21c8e)
* Merge branch 'upstream-curl' into update-curlBrad King2017-10-101-30/+217
| | | | | * upstream-curl: curl 2017-10-04 (3ea76790)
* Merge branch 'upstream-curl' into update-curlBrad King2017-06-141-3/+4
| | | | | | | | | * 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.
* Merge branch 'upstream-curl' into update-curlBrad King2017-05-111-4/+28
| | | | | | | | * 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.
* Merge branch 'upstream-curl' into update-curlBrad King2017-02-071-5/+79
| | | | | * upstream-curl: curl 2016-12-22 (44b9b4d4)
* Merge branch 'upstream-curl' into update-curlBrad King2016-12-051-1/+10
| | | | | * upstream-curl: curl 2016-11-02 (3c561c65)
* Merge branch 'upstream-curl' into update-curlBrad King2016-08-031-89/+154
| | | | | * upstream-curl: curl 2016-08-03 (f2cb3a01)
* Merge branch 'curl-upstream' into update-curlBrad King2015-08-121-25/+69
| | | | | | | 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.
* curl: Skip sanity check that triggers Clang warningBrad King2014-11-101-0/+2
| | | | | Defining curl APIs as forwarding macros triggers Clang warnings with -Wdisabled-macro-expansion. Skip this sanity check.
* curl: Fix curl.h inclusion of curlbuild.h from CMake sourcesBrad King2014-11-101-1/+1
| | | | | | 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.
* curl: Port to Haiku againBrad King2014-10-291-1/+1
| | | | | | | 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).
* Merge branch 'curl-upstream' into update-curlBrad King2014-10-291-302/+994
| | | | | Resolve all conflicts in favor of the upstream side. We can re-apply specific changes later.
* curl: Move sources back into upstream layoutBrad King2014-10-291-0/+1644
Update our build files as needed to compensate.
View Lorry Controller Status