Complete the integration of mod_heartbeat, mod_heartmonitor and the

loadable mod_watchdog, started with 771581.

This clears my list of missing modules as of 6 weeks ago, might be
a few new still to clear up.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@771589 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/Apache.dsw b/Apache.dsw
index ebe937cbbb5e9e5c29c30fe5984d30536d6f935f..f7d642e39639d226b7193bedd64215e719106b41 100644 (file)
--- a/Apache.dsw
+++ b/Apache.dsw
@@ -336,9 +336,6 @@ Package=<4>
     Project_Dep_Name mod_vhost_alias
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name mod_watchdog
-    End Project Dependency
-    Begin Project Dependency
     Project_Dep_Name ab
     End Project Dependency
     Begin Project Dependency
@@ -1899,6 +1896,9 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name libhttpd
     End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mod_watchdog
+    End Project Dependency
 }}}
 
 ###############################################################################
@@ -1920,6 +1920,9 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name libhttpd
     End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mod_watchdog
+    End Project Dependency
 }}}
 
 ###############################################################################

diff --git a/os/win32/BaseAddr.ref b/os/win32/BaseAddr.ref
index ab36471b58d6033ac67448154319254996a2e923..1517babf1c5d6eb9fb332306c7255cb8ffb92332 100644 (file)
--- a/os/win32/BaseAddr.ref
+++ b/os/win32/BaseAddr.ref
@@ -105,3 +105,4 @@ mod_lbmethod_bytraffic.so   0x6F810000    0x00010000
 mod_lbmethod_heartbeat.so   0x6F800000    0x00010000
 mod_heartbeat.so            0x6F7F0000    0x00010000
 mod_heartmonitor.so         0x6F7E0000    0x00010000
+mod_watchdog.so             0x6F7D0000    0x00010000