]> granicus.if.org Git - apache/commitdiff
mod_watchdog: Enable at --enable-modules=most for mod_proxy_hcheck
authorWilliam A. Rowe Jr <wrowe@apache.org>
Sun, 26 Jun 2016 15:40:45 +0000 (15:40 +0000)
committerWilliam A. Rowe Jr <wrowe@apache.org>
Sun, 26 Jun 2016 15:40:45 +0000 (15:40 +0000)
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

STATUS
modules/core/config.m4

diff --git a/STATUS b/STATUS
index 97b7420b8da5013d176bddbd85f860a48f814fd7..c5ef0b1b610fa151e7181590c47d8e15dfd89d7a 100644 (file)
--- 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 ]
index 8bb39a5cb235757da1883966a884a1afa3b8d983..94fb4a12483d97e49277056b4374401ea7d4d33e 100644 (file)
@@ -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])