summaryrefslogtreecommitdiffstats
path: root/Utilities/cmcurl/lib/http.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'upstream-curl' into update-curlBrad King2024-01-311-12/+12
| | | | | * upstream-curl: curl 2024-01-31 (5ce164e0)
* Merge branch 'upstream-curl' into update-curlBrad King2023-12-121-3/+3
| | | | | * upstream-curl: curl 2023-12-06 (7161cb17)
* Merge branch 'upstream-curl' into update-curlBrad King2023-09-221-8/+10
| | | | | | | | | | | * upstream-curl: curl 2023-09-13 (6fa1d817) Upstream significantly refactored `lib/CMakeLists.txt`, so take the upstream version of everything except the code added by commit 54cb23c657 (curl: Restore installation of OpenSSL DLLs, 2014-11-03, v3.2.0-rc1~418^2~4). We will apply our customizations again in a follow-up commit.
* Merge branch 'upstream-curl' into update-curlBrad King2023-05-301-85/+85
| | | | | * upstream-curl: curl 2023-05-30 (7ab9d437)
* Merge branch 'upstream-curl' into update-curlBrad King2023-02-211-82/+29
| | | | | * upstream-curl: curl 2023-02-20 (046209e5)
* Merge branch 'upstream-curl' into update-curlBrad King2023-01-271-1/+1
| | | | | * upstream-curl: curl 2022-12-21 (c12fb3dd)
* Merge branch 'upstream-curl' into update-curlBrad King2022-10-311-8/+19
| | | | | * upstream-curl: curl 2022-10-26 (cd95ee9f)
* Merge branch 'upstream-curl' into update-curlBrad King2022-04-281-3/+56
| | | | | * upstream-curl: curl 2022-04-27 (1669b17d)
* Merge branch 'upstream-curl' into update-curlBrad King2022-01-071-4/+2
| | | | | * upstream-curl: curl 2022-01-05 (801bd513)
* Merge branch 'upstream-curl' into update-curlBrad King2021-09-151-0/+3
| | | | | * upstream-curl: curl 2021-09-14 (8e82f2a0)
* Merge branch 'upstream-curl' into update-curlBrad King2021-05-271-5/+11
| | | | | * upstream-curl: curl 2021-05-26 (6b951a69)
* Merge branch 'upstream-curl' into update-curlBrad King2021-02-031-15/+73
| | | | | * upstream-curl: curl 2021-02-03 (2f33be81)
* Merge branch 'upstream-curl' into update-curlBrad King2020-12-091-1/+1
| | | | | * upstream-curl: curl 2020-12-09 (e0528597)
* Merge branch 'upstream-curl' into update-curlBrad King2020-08-191-0/+1
| | | | | * upstream-curl: curl 2020-08-19 (9d954e49)
* Merge branch 'upstream-curl' into update-curlBrad King2020-06-241-35/+13
| | | | | * upstream-curl: curl 2020-06-23 (e9db32a0)
* Merge branch 'upstream-curl' into update-curlBrad King2020-03-041-17/+33
| | | | | * upstream-curl: curl 2020-03-04 (b8d13668)
* Merge branch 'upstream-curl' into update-curlBrad King2019-05-221-4/+5
| | | | | * upstream-curl: curl 2019-05-22 (885ce314)
* Merge branch 'upstream-curl' into update-curlBrad King2018-10-311-8/+11
| | | | | * upstream-curl: curl 2018-10-30 (19667715)
* Merge branch 'upstream-curl' into update-curlBrad King2018-05-181-10/+5
| | | | | * upstream-curl: curl 2018-05-15 (cb013830)
* Merge branch 'upstream-curl' into update-curlBrad King2017-10-101-7/+10
| | | | | * upstream-curl: curl 2017-10-04 (3ea76790)
* Merge branch 'upstream-curl' into update-curlBrad King2017-05-111-0/+4
| | | | | | | | * 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 King2016-12-051-0/+1
| | | | | * upstream-curl: curl 2016-11-02 (3c561c65)
* Merge branch 'upstream-curl' into update-curlBrad King2016-08-031-5/+7
| | | | | * upstream-curl: curl 2016-08-03 (f2cb3a01)
* Merge branch 'curl-upstream' into update-curlBrad King2015-08-121-18/+46
| | | | | | | 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.
* Merge branch 'curl-upstream' into update-curlBrad King2014-10-291-19/+157
| | | | | 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/+85
Update our build files as needed to compensate.
generated by cgit v0.12 at 2024-09-25 12:40:39 (GMT)