Register output function so that core can retrieve it and set

scoreboard accordingly

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

diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c
index aa1734067c3840cf3267784839882e4226e14467..5ff5db071f61034492a2cb5264ba254832d1c2a5 100644 (file)
--- a/modules/proxy/mod_proxy.c
+++ b/modules/proxy/mod_proxy.c
@@ -19,6 +19,7 @@
 #include "mod_proxy.h"
 #include "mod_core.h"
 #include "apr_optional.h"
+#include "scoreboard.h"
 #include "mod_status.h"
 
 #if (MODULE_MAGIC_NUMBER_MAJOR > 20020903)
@@ -1766,7 +1767,8 @@ static void register_hooks(apr_pool_t *p)
 #ifndef FIX_15207
     static const char * const aszSucc[]={ "mod_rewrite.c", NULL };
 #endif
-
+    
+    APR_REGISTER_OPTIONAL_FN(ap_proxy_lb_workers);
     /* handler */
     ap_hook_handler(proxy_handler, NULL, NULL, APR_HOOK_FIRST);
     /* filename-to-URI translation */

diff --git a/modules/proxy/mod_proxy.h b/modules/proxy/mod_proxy.h
index 53ad4ae67e9224e1395308f21c685c4a473c5dbf..e11bb01af58b423d6bfd2c2321bd6abd1b3bb327 100644 (file)
--- a/modules/proxy/mod_proxy.h
+++ b/modules/proxy/mod_proxy.h
@@ -586,7 +586,7 @@ PROXY_DECLARE(int) ap_proxy_connection_create(const char *proxy_function,
 #endif
 /* The number of dynamic balancers that can be added */
 #define PROXY_DYNAMIC_BALANCER_LIMIT    16
-PROXY_DECLARE(int) ap_proxy_lb_workers(void);
+int ap_proxy_lb_workers(void);
 
 /* For proxy_util */
 extern module PROXY_DECLARE_DATA proxy_module;

diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c
index cb3d4b1a150017126d15efb825c397f3b2dabc5a..3358748744e6a99e76f3747a8933c4c44004a994 100644 (file)
--- a/modules/proxy/proxy_util.c
+++ b/modules/proxy/proxy_util.c
@@ -16,7 +16,6 @@
 /* Utility routines for Apache proxy */
 #include "mod_proxy.h"
 #include "ap_mpm.h"
-#include "scoreboard.h"
 #include "apr_version.h"
 
 #if APR_HAVE_UNISTD_H
@@ -1816,7 +1815,7 @@ PROXY_DECLARE(int) ap_proxy_connection_create(const char *proxy_function,
     return OK;
 }
 
-PROXY_DECLARE(int) ap_proxy_lb_workers(void)
+int ap_proxy_lb_workers(void)
 {
     /* Set the dynamic #workers limit */
     lb_workers_limit = lb_workers + PROXY_DYNAMIC_BALANCER_LIMIT;