!71 fix build error of "SSL_PROTOCAL_SSLV3 undeclared"

Merge pull request !71 from eaglegai/openEuler-22.03-LTS-Next
This commit is contained in:
openeuler-ci-bot 2022-01-07 07:21:34 +00:00 committed by Gitee
commit 231e1d952e
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 10 additions and 2 deletions

View File

@ -2,12 +2,14 @@ diff --git a/modules/ssl/ssl_engine_config.c b/modules/ssl/ssl_engine_config.c
index 517ce30..075f7e1 100644
--- a/modules/ssl/ssl_engine_config.c
+++ b/modules/ssl/ssl_engine_config.c
@@ -1474,6 +1474,8 @@ static const char *ssl_cmd_protocol_parse(cmd_parms *parms,
@@ -1474,6 +1474,10 @@ static const char *ssl_cmd_protocol_parse(cmd_parms *parms,
#endif
else if (strcEQ(w, "all")) {
thisopt = SSL_PROTOCOL_ALL;
+#ifndef OPENSSL_NO_SSL3
+ // by default, ALL kw doesn't turn on SSLv3
+ thisopt &= ~SSL_PROTOCOL_SSLV3;
+#endif
}
else {
return apr_pstrcat(parms->temp_pool,

View File

@ -8,7 +8,7 @@
Name: httpd
Summary: Apache HTTP Server
Version: 2.4.51
Release: 1
Release: 2
License: ASL 2.0
URL: https://httpd.apache.org/
Source0: https://archive.apache.org/dist/httpd/httpd-%{version}.tar.bz2
@ -501,6 +501,12 @@ exit $rv
%{_rpmconfigdir}/macros.d/macros.httpd
%changelog
* Fri Jan 07 2022 gaihuiying <gaihuiying1@huawei.com> - 2.4.51-2
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:fix build error of "SSL_PROTOCAL_SSLV3 undeclared"
* Fri Dec 10 2021 yanglu <yanglu72@huawei.com> - 2.4.51-1
- Type:requirement
- ID:NA