Reinsert extern int PROXY_DECLARE_DATA proxy_lb_workers

into the Proxy API.

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

diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c
index 5ccd9e25b56af7d8cf83239974ead60db753fac4..815c45a38ac890455824d9661509d192e7216569 100644 (file)
--- a/modules/proxy/mod_proxy.c
+++ b/modules/proxy/mod_proxy.c
@@ -38,7 +38,6 @@ APR_DECLARE_OPTIONAL_FN(char *, ssl_var_lookup,
 #endif
 
 /* Global balancer counter */
-extern int PROXY_DECLARE_DATA proxy_lb_workers;
 static int lb_workers_limit = 0;
 
 /**

diff --git a/modules/proxy/mod_proxy.h b/modules/proxy/mod_proxy.h
index bb0b9c81442c1c1c437fbd4d10eded679dbe1131..4dd52fc62f95ca1f2563fd280c1a69d08503cc54 100644 (file)
--- a/modules/proxy/mod_proxy.h
+++ b/modules/proxy/mod_proxy.h
@@ -734,5 +734,7 @@ PROXY_DECLARE(void) ap_proxy_backend_broke(request_rec *r,
 /* For proxy_util */
 extern module PROXY_DECLARE_DATA proxy_module;
 
+extern int PROXY_DECLARE_DATA proxy_lb_workers;
+
 #endif /*MOD_PROXY_H*/
 /** @} */

diff --git a/server/scoreboard.c b/server/scoreboard.c
index 99238bac236e1d015532c65f768d36bfa5e2150c..ab91d1292d72aa9694deac06d136aa1f98144fa5 100644 (file)
--- a/server/scoreboard.c
+++ b/server/scoreboard.c
@@ -61,7 +61,7 @@ AP_IMPLEMENT_HOOK_RUN_ALL(int,pre_mpm,
                           (p, sb_type),OK,DECLINED)
 
 static APR_OPTIONAL_FN_TYPE(ap_proxy_lb_workers)
-                                *proxy_lb_workers;
+                                *pfn_proxy_lb_workers;
 
 struct ap_sb_handle_t {
     int child_num;
@@ -94,10 +94,10 @@ AP_DECLARE(int) ap_calc_scoreboard_size(void)
     ap_mpm_query(AP_MPMQ_HARD_LIMIT_THREADS, &thread_limit);
     ap_mpm_query(AP_MPMQ_HARD_LIMIT_DAEMONS, &server_limit);
 
-    if (!proxy_lb_workers)
-        proxy_lb_workers = APR_RETRIEVE_OPTIONAL_FN(ap_proxy_lb_workers);
-    if (proxy_lb_workers)
-        lb_limit = proxy_lb_workers();
+    if (!pfn_proxy_lb_workers)
+        pfn_proxy_lb_workers = APR_RETRIEVE_OPTIONAL_FN(ap_proxy_lb_workers);
+    if (pfn_proxy_lb_workers)
+        lb_limit = pfn_proxy_lb_workers();
     else
         lb_limit = 0;