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

use IncludeOptional for conf.d/*.conf inclusion

Browse Source
This commit is contained in:
Joe Orton 2012-09-13 16:49:46 +01:00
parent 7d53cc989e
commit d8220f4b13
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
httpd.conf
View File

@ -347,5 +347,5 @@ EnableSendfile on
# Supplemental configuration # Supplemental configuration
# #
# Load conf files in the "/etc/httpd/conf.d" directory. # Load config files in the "/etc/httpd/conf.d" directory, if any.
Include conf.d/*.conf IncludeOptional conf.d/*.conf

5
httpd.spec
View File

@ -8,7 +8,7 @@
Summary: Apache HTTP Server Summary: Apache HTTP Server
Name: httpd Name: httpd
Version: 2.4.3 Version: 2.4.3
Release: 2%{?dist} Release: 3%{?dist}
URL: http://httpd.apache.org/ URL: http://httpd.apache.org/
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
Source1: index.html Source1: index.html
@ -574,6 +574,9 @@ rm -rf $RPM_BUILD_ROOT
%{_sysconfdir}/rpm/macros.httpd %{_sysconfdir}/rpm/macros.httpd
%changelog %changelog
* Thu Sep 13 2012 Joe Orton <jorton@redhat.com> - 2.4.3-3
- use IncludeOptional for conf.d/*.conf inclusion
* Tue Aug 21 2012 Joe Orton <jorton@redhat.com> - 2.4.3-2 * Tue Aug 21 2012 Joe Orton <jorton@redhat.com> - 2.4.3-2
- mod_ssl: add check for proxy keypair match (upstream r1374214) - mod_ssl: add check for proxy keypair match (upstream r1374214)