]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
Merge r1916863 from trunk:
authorJoe Orton <jorton@apache.org>
Mon, 17 Jun 2024 14:21:04 +0000 (14:21 +0000)
committerJoe Orton <jorton@apache.org>
Mon, 17 Jun 2024 14:21:04 +0000 (14:21 +0000)
commite94e0fbb15c662d3e9bd04f790235d60fedfef09
tree73f0799942f4bb6c85564a52870d04c076740751
parent0aa7f148f7a38429f6036628c6ccb04c860adab7
Merge r1916863 from trunk:

* Ensure that we set the default DH parameters for the key

Replace else with an if as the if branch no longer ensures that
custome DH parameters have been loaded.
This fixes a regression that causes the default DH parameters for a key
no longer set and thus effectively disabling DH ciphers when no explicit
DH parameters are set.

PR: 68863
Submitted by: rpluem
Reviewed by: rpluem, jorton, ylavic

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1918385 13f79535-47bb-0310-9956-ffa450edef68
changes-entries/pr68863.txt [new file with mode: 0644]
modules/ssl/ssl_engine_init.c