load mod_watchdog by default (#1353582)

Resolves: rhbz#1325883
Resolves: rhbz#1353582
This commit is contained in:
Joe Orton 2016-07-07 19:29:00 +01:00
parent 53f8164b15
commit 17ef1b1f5e
3 changed files with 5 additions and 2 deletions

View File

@ -64,4 +64,5 @@ LoadModule unixd_module modules/mod_unixd.so
LoadModule userdir_module modules/mod_userdir.so LoadModule userdir_module modules/mod_userdir.so
LoadModule version_module modules/mod_version.so LoadModule version_module modules/mod_version.so
LoadModule vhost_alias_module modules/mod_vhost_alias.so LoadModule vhost_alias_module modules/mod_vhost_alias.so
LoadModule watchdog_module modules/mod_watchdog.so

View File

@ -5,7 +5,6 @@
#LoadModule asis_module modules/mod_asis.so #LoadModule asis_module modules/mod_asis.so
#LoadModule buffer_module modules/mod_buffer.so #LoadModule buffer_module modules/mod_buffer.so
#LoadModule watchdog_module modules/mod_watchdog.so
#LoadModule heartbeat_module modules/mod_heartbeat.so #LoadModule heartbeat_module modules/mod_heartbeat.so
#LoadModule heartmonitor_module modules/mod_heartmonitor.so #LoadModule heartmonitor_module modules/mod_heartmonitor.so
#LoadModule usertrack_module modules/mod_usertrack.so #LoadModule usertrack_module modules/mod_usertrack.so

View File

@ -8,7 +8,7 @@
Summary: Apache HTTP Server Summary: Apache HTTP Server
Name: httpd Name: httpd
Version: 2.4.23 Version: 2.4.23
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
@ -682,6 +682,9 @@ rm -rf $RPM_BUILD_ROOT
%{_rpmconfigdir}/macros.d/macros.httpd %{_rpmconfigdir}/macros.d/macros.httpd
%changelog %changelog
* Thu Jul 7 2016 Joe Orton <jorton@redhat.com> - 2.4.23-3
- load mod_watchdog by default (#1353582)
* Thu Jul 7 2016 Joe Orton <jorton@redhat.com> - 2.4.23-2 * Thu Jul 7 2016 Joe Orton <jorton@redhat.com> - 2.4.23-2
- restore build of mod_proxy_fdpass (#1325883) - restore build of mod_proxy_fdpass (#1325883)
- improve check tests to catch configured-but-not-built modules - improve check tests to catch configured-but-not-built modules