* ap_proxy_balancer_get_best_worker cannot be exported and used as an optional

  function at the same time. So rename ap_proxy_balancer_get_best_worker to
  proxy_balancer_get_best_worker and make it static which is then used as an
  optional function and recreate ap_proxy_balancer_get_best_worker as an
  exported thin wrapper of proxy_balancer_get_best_worker.

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

diff --git a/modules/proxy/balancers/mod_lbmethod_bybusyness.c b/modules/proxy/balancers/mod_lbmethod_bybusyness.c
index 21ba5caffe3e56adf270280ae63dc387f7d9ba6b..80d538cdaaaaf0e1d0ee9b195c7eb27b27861a9f 100644 (file)
--- a/modules/proxy/balancers/mod_lbmethod_bybusyness.c
+++ b/modules/proxy/balancers/mod_lbmethod_bybusyness.c
@@ -22,7 +22,7 @@
 
 module AP_MODULE_DECLARE_DATA lbmethod_bybusyness_module;
 
-static APR_OPTIONAL_FN_TYPE(ap_proxy_balancer_get_best_worker)
+static APR_OPTIONAL_FN_TYPE(proxy_balancer_get_best_worker)
                             *ap_proxy_balancer_get_best_worker_fn = NULL;
 
 static int is_best_bybusyness(proxy_worker *current, proxy_worker *prev_best, void *baton)
@@ -97,7 +97,7 @@ static int lbmethod_bybusyness_post_config(apr_pool_t *pconf, apr_pool_t *plog,
     }
 
     ap_proxy_balancer_get_best_worker_fn =
-                 APR_RETRIEVE_OPTIONAL_FN(ap_proxy_balancer_get_best_worker);
+                 APR_RETRIEVE_OPTIONAL_FN(proxy_balancer_get_best_worker);
     if (!ap_proxy_balancer_get_best_worker_fn) {
         ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, APLOGNO(10151)
                      "mod_proxy must be loaded for mod_lbmethod_bybusyness");

diff --git a/modules/proxy/balancers/mod_lbmethod_byrequests.c b/modules/proxy/balancers/mod_lbmethod_byrequests.c
index c7c6ad5e3ecff4f3f991ef0760457871bd640c86..b6cd8d8b8bdeb24f5d8b5b27f94f69c3fc0c54ab 100644 (file)
--- a/modules/proxy/balancers/mod_lbmethod_byrequests.c
+++ b/modules/proxy/balancers/mod_lbmethod_byrequests.c
@@ -22,7 +22,7 @@
 
 module AP_MODULE_DECLARE_DATA lbmethod_byrequests_module;
 
-static APR_OPTIONAL_FN_TYPE(ap_proxy_balancer_get_best_worker)
+static APR_OPTIONAL_FN_TYPE(proxy_balancer_get_best_worker)
                             *ap_proxy_balancer_get_best_worker_fn = NULL;
 
 static int is_best_byrequests(proxy_worker *current, proxy_worker *prev_best, void *baton)
@@ -138,7 +138,7 @@ static int lbmethod_byrequests_post_config(apr_pool_t *pconf, apr_pool_t *plog,
     }
 
     ap_proxy_balancer_get_best_worker_fn =
-                 APR_RETRIEVE_OPTIONAL_FN(ap_proxy_balancer_get_best_worker);
+                 APR_RETRIEVE_OPTIONAL_FN(proxy_balancer_get_best_worker);
     if (!ap_proxy_balancer_get_best_worker_fn) {
         ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, APLOGNO(10152)
                      "mod_proxy must be loaded for mod_lbmethod_byrequests");

diff --git a/modules/proxy/balancers/mod_lbmethod_bytraffic.c b/modules/proxy/balancers/mod_lbmethod_bytraffic.c
index 445a328f5a6dd9136dd7a1c2690e74a58f2e67fc..6cfab94c0573626fe39d0c12cbf7a4ed57a68eeb 100644 (file)
--- a/modules/proxy/balancers/mod_lbmethod_bytraffic.c
+++ b/modules/proxy/balancers/mod_lbmethod_bytraffic.c
@@ -22,7 +22,7 @@
 
 module AP_MODULE_DECLARE_DATA lbmethod_bytraffic_module;
 
-static APR_OPTIONAL_FN_TYPE(ap_proxy_balancer_get_best_worker)
+static APR_OPTIONAL_FN_TYPE(proxy_balancer_get_best_worker)
                             *ap_proxy_balancer_get_best_worker_fn = NULL;
 
 static int is_best_bytraffic(proxy_worker *current, proxy_worker *prev_best, void *baton)
@@ -108,7 +108,7 @@ static int lbmethod_bytraffic_post_config(apr_pool_t *pconf, apr_pool_t *plog,
     }
 
     ap_proxy_balancer_get_best_worker_fn =
-                 APR_RETRIEVE_OPTIONAL_FN(ap_proxy_balancer_get_best_worker);
+                 APR_RETRIEVE_OPTIONAL_FN(proxy_balancer_get_best_worker);
     if (!ap_proxy_balancer_get_best_worker_fn) {
         ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, APLOGNO(10150)
                      "mod_proxy must be loaded for mod_lbmethod_bytraffic");

diff --git a/modules/proxy/mod_proxy.h b/modules/proxy/mod_proxy.h
index cec243840b03bb375705224d9fa956a9d0d5c818..f14f9e56704bed2b4c35287dc7311ce7f70b6627 100644 (file)
--- a/modules/proxy/mod_proxy.h
+++ b/modules/proxy/mod_proxy.h
@@ -883,7 +883,7 @@ PROXY_DECLARE(proxy_worker *) ap_proxy_balancer_get_best_worker(proxy_balancer *
 /*
  * Needed by the lb modules.
  */
-APR_DECLARE_OPTIONAL_FN(proxy_worker *, ap_proxy_balancer_get_best_worker,
+APR_DECLARE_OPTIONAL_FN(proxy_worker *, proxy_balancer_get_best_worker,
                                         (proxy_balancer *balancer,
                                          request_rec *r,
                                          proxy_is_best_callback_fn_t *is_best,

diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c
index bb24ca0802ce9edb9bfef85e906b4d21162ece24..7de1b39c166d780610a20452ee78f44fcb7c3465 100644 (file)
--- a/modules/proxy/proxy_util.c
+++ b/modules/proxy/proxy_util.c
@@ -69,6 +69,10 @@ static int proxy_match_domainname(struct dirconn_entry *This, request_rec *r);
 static int proxy_match_hostname(struct dirconn_entry *This, request_rec *r);
 static int proxy_match_word(struct dirconn_entry *This, request_rec *r);
 static int ap_proxy_retry_worker(const char *proxy_function, proxy_worker *worker, server_rec *s);
+static proxy_worker *proxy_balancer_get_best_worker(proxy_balancer *balancer,
+                                                    request_rec *r,
+                                                    proxy_is_best_callback_fn_t *is_best,
+                                                    void *baton);
 
 APR_IMPLEMENT_OPTIONAL_HOOK_RUN_ALL(proxy, PROXY, int, create_req,
                                    (request_rec *r, request_rec *pr), (r, pr),
@@ -1300,10 +1304,10 @@ PROXY_DECLARE(apr_status_t) ap_proxy_initialize_balancer(proxy_balancer *balance
     return APR_SUCCESS;
 }
 
-PROXY_DECLARE(proxy_worker *) ap_proxy_balancer_get_best_worker(proxy_balancer *balancer,
-                                                                request_rec *r,
-                                                                proxy_is_best_callback_fn_t *is_best,
-                                                                void *baton)
+static proxy_worker *proxy_balancer_get_best_worker(proxy_balancer *balancer,
+                                                    request_rec *r,
+                                                    proxy_is_best_callback_fn_t *is_best,
+                                                    void *baton)
 {
     int i = 0;
     int cur_lbset = 0;
@@ -1415,6 +1419,14 @@ PROXY_DECLARE(proxy_worker *) ap_proxy_balancer_get_best_worker(proxy_balancer *
     return best_worker;
 }
 
+PROXY_DECLARE(proxy_worker *) ap_proxy_balancer_get_best_worker(proxy_balancer *balancer,
+                                                                request_rec *r,
+                                                                proxy_is_best_callback_fn_t *is_best,
+                                                                void *baton)
+{
+    return proxy_balancer_get_best_worker(balancer, r, is_best, baton);
+}
+
 /*
  * CONNECTION related...
  */
@@ -4079,5 +4091,5 @@ void proxy_util_register_hooks(apr_pool_t *p)
 {
     APR_REGISTER_OPTIONAL_FN(ap_proxy_retry_worker);
     APR_REGISTER_OPTIONAL_FN(ap_proxy_clear_connection);
-    APR_REGISTER_OPTIONAL_FN(ap_proxy_balancer_get_best_worker);
+    APR_REGISTER_OPTIONAL_FN(proxy_balancer_get_best_worker);
 }