From: William A. Rowe Jr <wrowe@apache.org>
Date: Sun, 26 Jun 2016 15:40:45 +0000 (+0000)
Subject: mod_watchdog: Enable at --enable-modules=most for mod_proxy_hcheck
X-Git-Tag: 2.4.23~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0e6af7524e3d102974572f4673538ed51340f9f;p=thirdparty%2Fapache%2Fhttpd.git

mod_watchdog: Enable at --enable-modules=most for mod_proxy_hcheck

Backports: r1749924
Submitted by: wrowe
Reviewed by: rpluem, ylavic



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1750255 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index 97b7420b8da..c5ef0b1b610 100644
--- a/STATUS
+++ b/STATUS
@@ -116,11 +116,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) mod_watchdog: Enable at --enable-modules=most for mod_proxy_hcheck
-     trunk patch: http://svn.apache.org/viewvc?rev=1749924&view=rev
-     2.4.x: trunk patch works
-     +1: wrowe, rpluem, ylavic
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
diff --git a/modules/core/config.m4 b/modules/core/config.m4
index 8bb39a5cb23..94fb4a12483 100644
--- a/modules/core/config.m4
+++ b/modules/core/config.m4
@@ -45,7 +45,7 @@ fi
 
 APACHE_MODULE(so, DSO capability.  This module will be automatically enabled unless you build all modules statically., , , $enable_so)
 
-APACHE_MODULE(watchdog, Watchdog module, , , , [
+APACHE_MODULE(watchdog, Watchdog module, , , most, [
     APR_CHECK_APR_DEFINE(APR_HAS_THREADS)
     if test $ac_cv_define_APR_HAS_THREADS = "no"; then
         AC_MSG_WARN([mod_watchdog requires apr to be built with --enable-threads])