rpms/httpd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

mod_ssl: drop implicit 'SSLEngine on' for vhost w/o certs (#1564537)

Browse Source 
Resolves: rhbz#1564537
This commit is contained in:
Joe Orton 2018-04-12 08:03:52 +01:00
parent cb3c26bd43
commit 07274a959f
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
httpd-2.4.33-sslmerging.patch Normal file
View File

@ -0,0 +1,15 @@
https://bugzilla.redhat.com/show_bug.cgi?id=1564537
--- httpd-2.4.33/modules/ssl/ssl_engine_init.c.sslmerging
+++ httpd-2.4.33/modules/ssl/ssl_engine_init.c
@@ -261,7 +261,8 @@
* the protocol is https. */
if (ap_get_server_protocol(s)
&& strcmp("https", ap_get_server_protocol(s)) == 0
- && sc->enabled == SSL_ENABLED_UNSET) {
+ && sc->enabled == SSL_ENABLED_UNSET
+ && (!apr_is_empty_array(sc->server->pks->cert_files))) {
sc->enabled = SSL_ENABLED_TRUE;
}

8
httpd.spec
View File

@ -13,7 +13,7 @@
Summary: Apache HTTP Server
Name: httpd
Version: 2.4.33
Release: 2%{?dist}
Release: 3%{?dist}
URL: https://httpd.apache.org/
Source0: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
Source1: index.html
@ -74,6 +74,8 @@ Patch35: httpd-2.4.33-sslciphdefault.patch
# Bug fixes
# https://bugzilla.redhat.com/show_bug.cgi?id=1397243
Patch58: httpd-2.4.33-r1738878.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1564537
Patch59: httpd-2.4.33-sslmerging.patch
# Security fixes
@ -227,6 +229,7 @@ interface for storing and accessing per-user session data.
%patch34 -p1 -b .socketactivation
%patch35 -p1 -b .sslciphdefault
%patch58 -p1 -b .r1738878
%patch59 -p1 -b .sslmerging
# Patch in the vendor string
sed -i '/^#define PLATFORM/s/Unix/%{vstring}/' os/unix/os.h
@ -704,6 +707,9 @@ exit $rv
%{_rpmconfigdir}/macros.d/macros.httpd
%changelog
* Thu Apr 12 2018 Joe Orton <jorton@redhat.com> - 2.4.33-3
- mod_ssl: drop implicit 'SSLEngine on' for vhost w/o certs (#1564537)
* Fri Mar 30 2018 Adam Williamson <awilliam@redhat.com> - 2.4.33-2
- Exclude mod_md config file from main package (#1562413)