diff options
author | Jim Jagielski <jim@apache.org> | 2009-05-06 16:01:37 +0000 |
---|---|---|
committer | Jim Jagielski <jim@apache.org> | 2009-05-06 16:01:37 +0000 |
commit | a13b94e4307f6dc2fc906302b0eafb2c80a4bbc3 (patch) | |
tree | 0b3d6bf0867613a9fd4dfa44b8191ab32e5b07c4 | |
parent | 666508d21d7da9591bbf67d6ddbd20bf4ab546f0 (diff) | |
download | httpd-a13b94e4307f6dc2fc906302b0eafb2c80a4bbc3.tar.gz |
And un-module the files
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-2.2-proxy@772335 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | modules/proxy/mod_lbmethod_bybusyness.c | 20 | ||||
-rw-r--r-- | modules/proxy/mod_lbmethod_byrequests.c | 23 | ||||
-rw-r--r-- | modules/proxy/mod_lbmethod_bytraffic.c | 23 |
3 files changed, 3 insertions, 63 deletions
diff --git a/modules/proxy/mod_lbmethod_bybusyness.c b/modules/proxy/mod_lbmethod_bybusyness.c index 1861084a5c..212ce14b9a 100644 --- a/modules/proxy/mod_lbmethod_bybusyness.c +++ b/modules/proxy/mod_lbmethod_bybusyness.c @@ -20,8 +20,6 @@ #include "apr_version.h" #include "apr_hooks.h" -module AP_MODULE_DECLARE_DATA lbmethod_bybusyness_module; - static proxy_worker *find_best_bybusyness(proxy_balancer *balancer, request_rec *r) { @@ -113,7 +111,7 @@ static apr_status_t age(proxy_balancer *balancer, request_rec *r) { return APR_SUCCESS; } -static const proxy_balancer_method bybusyness = +const proxy_balancer_method proxy_balancer_bybusyness = { "bybusyness", &find_best_bybusyness, @@ -121,19 +119,3 @@ static const proxy_balancer_method bybusyness = &age, NULL }; - - -static void register_hook(apr_pool_t *p) -{ - ap_register_provider(p, PROXY_LBMETHOD, "bybusyness", "0", &bybusyness); -} - -module AP_MODULE_DECLARE_DATA lbmethod_bybusyness_module = { - STANDARD20_MODULE_STUFF, - NULL, /* create per-directory config structure */ - NULL, /* merge per-directory config structures */ - NULL, /* create per-server config structure */ - NULL, /* merge per-server config structures */ - NULL, /* command apr_table_t */ - register_hook /* register hooks */ -}; diff --git a/modules/proxy/mod_lbmethod_byrequests.c b/modules/proxy/mod_lbmethod_byrequests.c index a895d44371..63278e12e0 100644 --- a/modules/proxy/mod_lbmethod_byrequests.c +++ b/modules/proxy/mod_lbmethod_byrequests.c @@ -20,8 +20,6 @@ #include "apr_version.h" #include "apr_hooks.h" -module AP_MODULE_DECLARE_DATA lbmethod_byrequests_module; - /* * The idea behind the find_best_byrequests scheduler is the following: * @@ -146,7 +144,7 @@ static apr_status_t age(proxy_balancer *balancer, request_rec *r) { * (eg: find_best_bytraffic, above) * 2. Register it as a provider. */ -static const proxy_balancer_method byrequests = +const proxy_balancer_method proxy_balancer_byrequests = { "byrequests", &find_best_byrequests, @@ -154,22 +152,3 @@ static const proxy_balancer_method byrequests = &age, NULL }; - -static void register_hook(apr_pool_t *p) -{ - /* Only the mpm_winnt has child init hook handler. - * make sure that we are called after the mpm - * initializes and after the mod_proxy - */ - ap_register_provider(p, PROXY_LBMETHOD, "byrequests", "0", &byrequests); -} - -module AP_MODULE_DECLARE_DATA lbmethod_byrequests_module = { - STANDARD20_MODULE_STUFF, - NULL, /* create per-directory config structure */ - NULL, /* merge per-directory config structures */ - NULL, /* create per-server config structure */ - NULL, /* merge per-server config structures */ - NULL, /* command apr_table_t */ - register_hook /* register hooks */ -}; diff --git a/modules/proxy/mod_lbmethod_bytraffic.c b/modules/proxy/mod_lbmethod_bytraffic.c index 2c231d0e33..3e6fd6aa66 100644 --- a/modules/proxy/mod_lbmethod_bytraffic.c +++ b/modules/proxy/mod_lbmethod_bytraffic.c @@ -20,8 +20,6 @@ #include "apr_version.h" #include "apr_hooks.h" -module AP_MODULE_DECLARE_DATA lbmethod_bytraffic_module; - /* * The idea behind the find_best_bytraffic scheduler is the following: * @@ -113,7 +111,7 @@ static apr_status_t age(proxy_balancer *balancer, request_rec *r) { return APR_SUCCESS; } -static const proxy_balancer_method bytraffic = +const proxy_balancer_method proxy_balancer_bytraffic = { "bytraffic", &find_best_bytraffic, @@ -121,22 +119,3 @@ static const proxy_balancer_method bytraffic = &age, NULL }; - -static void register_hook(apr_pool_t *p) -{ - /* Only the mpm_winnt has child init hook handler. - * make sure that we are called after the mpm - * initializes and after the mod_proxy - */ - ap_register_provider(p, PROXY_LBMETHOD, "bytraffic", "0", &bytraffic); -} - -module AP_MODULE_DECLARE_DATA lbmethod_bytraffic_module = { - STANDARD20_MODULE_STUFF, - NULL, /* create per-directory config structure */ - NULL, /* merge per-directory config structures */ - NULL, /* create per-server config structure */ - NULL, /* merge per-server config structures */ - NULL, /* command apr_table_t */ - register_hook /* register hooks */ -}; |