packages/httpd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix build error of 'SSL_PROTOCAL_SSLV3 undeclared'

Browse Source
This commit is contained in:
eaglegai 2022-01-07 10:42:17 +08:00
parent b1630e9088
commit e522949012
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backport-httpd-2.4.34-enable-sslv3.patch
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 index 517ce30..075f7e1 100644
--- a/modules/ssl/ssl_engine_config.c --- a/modules/ssl/ssl_engine_config.c
+++ b/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 #endif
else if (strcEQ(w, "all")) { else if (strcEQ(w, "all")) {
thisopt = SSL_PROTOCOL_ALL; thisopt = SSL_PROTOCOL_ALL;
+#ifndef OPENSSL_NO_SSL3
+ // by default, ALL kw doesn't turn on SSLv3 + // by default, ALL kw doesn't turn on SSLv3
+ thisopt &= ~SSL_PROTOCOL_SSLV3; + thisopt &= ~SSL_PROTOCOL_SSLV3;
+#endif
} }
else { else {
return apr_pstrcat(parms->temp_pool, return apr_pstrcat(parms->temp_pool,

8
httpd.spec
View File

@ -8,7 +8,7 @@
Name: httpd Name: httpd
Summary: Apache HTTP Server Summary: Apache HTTP Server
Version: 2.4.51 Version: 2.4.51
Release: 1 Release: 2
License: ASL 2.0 License: ASL 2.0
URL: https://httpd.apache.org/ URL: https://httpd.apache.org/
Source0: https://archive.apache.org/dist/httpd/httpd-%{version}.tar.bz2 Source0: https://archive.apache.org/dist/httpd/httpd-%{version}.tar.bz2
@ -501,6 +501,12 @@ exit $rv
%{_rpmconfigdir}/macros.d/macros.httpd %{_rpmconfigdir}/macros.d/macros.httpd
%changelog %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 * Fri Dec 10 2021 yanglu <yanglu72@huawei.com> - 2.4.51-1
- Type:requirement - Type:requirement
- ID:NA - ID:NA