]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
Merge of r1853133,r1853166 from trunk:
authorStefan Eissing <icing@apache.org>
Fri, 8 Feb 2019 09:01:42 +0000 (09:01 +0000)
committerStefan Eissing <icing@apache.org>
Fri, 8 Feb 2019 09:01:42 +0000 (09:01 +0000)
commitfd5efd0b43f07673e45c4c577f60cf1cd7c280df
tree6841c44d6c3a980d07b3783bbf6a58aa49e43296
parent7d7f8d13d975668287b45c7afd8fa53878706eec
Merge of r1853133,r1853166 from trunk:

mod_ssl: Don't unset FIPS mode on restart unless it's forced by
     configuration (SSLFIPS on) and not active by default in OpenSSL. PR 63136.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1853197 13f79535-47bb-0310-9956-ffa450edef68
CHANGES
modules/ssl/mod_ssl.c
modules/ssl/ssl_engine_init.c