Google Git
Sign in
apache/serf/refs/heads/1.3.x-sslbuild
commit
7ef50153e6831d723e2e7aa62e37f01ceb848256
[log]
author
Stefan Sperling <stsp@apache.org>
Mon May 29 15:35:20 2023 +0000
committer
Stefan Sperling <stsp@apache.org>
Mon May 29 15:35:20 2023 +0000
tree
55468def72d605598404dfb22a0f6d9d62f887d6
parent
a48dcf1c21b939f572017a9876c566c649a318f6 [diff]
parent
ac14f3b1c72b2e5ebeebde9c7e7b01523ff0d075 [diff]
On the 1.3.x-sslbuild branch: Merge from 1.3.x, resovling conflicts.

The only merge conflict was due to the introduction of the
bio_file_ctrl() function in buckets/ssl_buckets.c.


git-svn-id: https://svn.apache.org/repos/asf/serf/branches/1.3.x-sslbuild@1910116 13f79535-47bb-0310-9956-ffa450edef68
tree: 55468def72d605598404dfb22a0f6d9d62f887d6
  1. .github/
  2. auth/
  3. buckets/
  4. build/
  5. test/
  6. CHANGES
  7. context.c
  8. design-guide.txt
  9. dist.sh
  10. incoming.c
  11. LICENSE
  12. NOTICE
  13. outgoing.c
  14. README
  15. SConstruct
  16. serf.h
  17. serf_bucket_types.h
  18. serf_bucket_util.h
  19. serf_private.h
  20. ssltunnel.c
  21. STATUS