Merge r1802845 from trunk:

Make sure updatelbstatus() is NULL

Submitted by: jim
Reviewed by: jim, covener, ylavic

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

diff --git a/STATUS b/STATUS
index 852ba5f7b7e852ce86213fc67322225030080975..bf11b3b84fc4d840f5acc59b0227faad77654ba1 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -119,11 +119,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch: svn merge -c 1801594 ^/httpd/httpd/trunk .
      +1: jfclere, jim, covener
 
-  *) proxy: Ensure updatelbstatus() is NULL if not-implemented
-     trunk patch: http://svn.apache.org/r1802845
-     2.4.x patch: trunk patch works
-     +1: jim, covener, ylavic
-
   *) mod_http2: fix for stalling when more than 32KB are written to a suspended stream
      2.4.x patch: svn merge -c 1803420,1803454,1804090 ^/httpd/httpd/trunk .
      +1: icing, steffenal, ylavic

diff --git a/modules/proxy/balancers/mod_lbmethod_bybusyness.c b/modules/proxy/balancers/mod_lbmethod_bybusyness.c
index 67d53a3551e00d1e7832606ba7db6c37b16f00a8..30a8f55429c6224bbf745c8c91036ff474cb8361 100644 (file)
--- a/modules/proxy/balancers/mod_lbmethod_bybusyness.c
+++ b/modules/proxy/balancers/mod_lbmethod_bybusyness.c
@@ -141,7 +141,8 @@ static const proxy_balancer_method bybusyness =
     &find_best_bybusyness,
     NULL,
     &reset,
-    &age
+    &age,
+    NULL
 };
 
 static void register_hook(apr_pool_t *p)

diff --git a/modules/proxy/balancers/mod_lbmethod_byrequests.c b/modules/proxy/balancers/mod_lbmethod_byrequests.c
index 206fe9216b52bfe459e5ffa787d21d1f93413301..83424cefed90d26ea9ab3e80b9f5facd364d7cfb 100644 (file)
--- a/modules/proxy/balancers/mod_lbmethod_byrequests.c
+++ b/modules/proxy/balancers/mod_lbmethod_byrequests.c
@@ -177,7 +177,8 @@ static const proxy_balancer_method byrequests =
     &find_best_byrequests,
     NULL,
     &reset,
-    &age
+    &age,
+    NULL
 };
 
 static void register_hook(apr_pool_t *p)

diff --git a/modules/proxy/balancers/mod_lbmethod_bytraffic.c b/modules/proxy/balancers/mod_lbmethod_bytraffic.c
index b3fe556a55050dcf58c65887ca91ebc0793eaaab..6cf2478de55b3d7865f5dfa2b6a652aad5615b97 100644 (file)
--- a/modules/proxy/balancers/mod_lbmethod_bytraffic.c
+++ b/modules/proxy/balancers/mod_lbmethod_bytraffic.c
@@ -146,7 +146,8 @@ static const proxy_balancer_method bytraffic =
     &find_best_bytraffic,
     NULL,
     &reset,
-    &age
+    &age,
+    NULL
 };
 
 static void register_hook(apr_pool_t *p)

diff --git a/modules/proxy/balancers/mod_lbmethod_heartbeat.c b/modules/proxy/balancers/mod_lbmethod_heartbeat.c
index 8b52eca6a27b7aaa0eb1d3226dedcd5ed73ed8c1..640bddb7f752778640cf525a998c12c712b8b16e 100644 (file)
--- a/modules/proxy/balancers/mod_lbmethod_heartbeat.c
+++ b/modules/proxy/balancers/mod_lbmethod_heartbeat.c
@@ -358,7 +358,8 @@ static const proxy_balancer_method heartbeat =
     &find_best_hb,
     NULL,
     &reset,
-    &age
+    &age,
+    NULL
 };
 
 static int lb_hb_init(apr_pool_t *p, apr_pool_t *plog,