]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
projects / thirdparty / apache / httpd.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 274a11c) | patch
Merge r1926720, r1926722 from trunk:
authorJoe Orton <jorton@apache.org>
Mon, 7 Jul 2025 09:15:21 +0000 (09:15 +0000)
committerJoe Orton <jorton@apache.org>
Mon, 7 Jul 2025 09:15:21 +0000 (09:15 +0000)
commite0be9fb7fc8b2b83c8d9d76ebd414ebb0e135581
treed514337c993da76f13184bb14c503f2d486dc73atree | snapshot
parent274a11c631f8eef78ebbe502d3f1936b5406bd0acommit | diff
Merge r1926720, r1926722 from trunk:

* modules/ssl/ssl_private.h: For OpenSSL >= 3.5.0 drop $SSLKEYLOGFILE
  handling inside mod_ssl where OpenSSL is built to handle that
  internally in libssl.

* modules/ssl/ssl_private.h: Fix logic in r1926720 HAVE_OPENSSL_KEYLOG macro,
  thanks to rpluem.

Reviewed by: rpluem
Submitted by: jorton
Reviewed by: jorton, rpluem, ylavic
Github: closes #538

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1927023 13f79535-47bb-0310-9956-ffa450edef68
changes-entries/ssl-less-keylog.txt [new file with mode: 0644] blob
modules/ssl/ssl_private.h diff | blob | blame | history
Mirror of https://github.com/apache/httpd.git