Google Git
Sign in
apache / serf / refs/heads/1.3.x-r1902208+r1902304
commit08b6eba42f6c279e0803d5f6fc62464aa1f18844[log] [tgz]
authorEvgeny Kotkov <kotkov@apache.org>Tue Apr 25 08:49:22 2023 +0000
committerEvgeny Kotkov <kotkov@apache.org>Tue Apr 25 08:49:22 2023 +0000
treec07f555ef3905a00963e8381564514bd4d73a51b
parent1e92b971221bb565943c933931df7a8c83a7b72c [diff]
On the '1.3.x-r1902208+r1902304' branch: Merge r1902208, r1902304 from trunk:

- r1902208: Add support for BIO_CTRL_EOF, which is being used by OpenSSL 3.0+
  and OpenSSL 1.1.1e.
- r1902304: Fix the return value for unknown controls in the BIO control
  functions.

Resolve the conflicts and adjust the change to the state of the 1.3.x branch.


git-svn-id: https://svn.apache.org/repos/asf/serf/branches/1.3.x-r1902208+r1902304@1909397 13f79535-47bb-0310-9956-ffa450edef68
3 files changed
tree: c07f555ef3905a00963e8381564514bd4d73a51b
  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