You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2009/05/06 18:01:37 UTC
svn commit: r772335 - in /httpd/httpd/branches/httpd-2.2-proxy/modules/proxy:
mod_lbmethod_bybusyness.c mod_lbmethod_byrequests.c mod_lbmethod_bytraffic.c
Author: jim
Date: Wed May 6 16:01:37 2009
New Revision: 772335
URL: http://svn.apache.org/viewvc?rev=772335&view=rev
Log:
And un-module the files
Modified:
httpd/httpd/branches/httpd-2.2-proxy/modules/proxy/mod_lbmethod_bybusyness.c
httpd/httpd/branches/httpd-2.2-proxy/modules/proxy/mod_lbmethod_byrequests.c
httpd/httpd/branches/httpd-2.2-proxy/modules/proxy/mod_lbmethod_bytraffic.c
Modified: httpd/httpd/branches/httpd-2.2-proxy/modules/proxy/mod_lbmethod_bybusyness.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/httpd-2.2-proxy/modules/proxy/mod_lbmethod_bybusyness.c?rev=772335&r1=772334&r2=772335&view=diff
==============================================================================
--- httpd/httpd/branches/httpd-2.2-proxy/modules/proxy/mod_lbmethod_bybusyness.c (original)
+++ httpd/httpd/branches/httpd-2.2-proxy/modules/proxy/mod_lbmethod_bybusyness.c Wed May 6 16:01:37 2009
@@ -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 @@
return APR_SUCCESS;
}
-static const proxy_balancer_method bybusyness =
+const proxy_balancer_method proxy_balancer_bybusyness =
{
"bybusyness",
&find_best_bybusyness,
@@ -121,19 +119,3 @@
&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 */
-};
Modified: httpd/httpd/branches/httpd-2.2-proxy/modules/proxy/mod_lbmethod_byrequests.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/httpd-2.2-proxy/modules/proxy/mod_lbmethod_byrequests.c?rev=772335&r1=772334&r2=772335&view=diff
==============================================================================
--- httpd/httpd/branches/httpd-2.2-proxy/modules/proxy/mod_lbmethod_byrequests.c (original)
+++ httpd/httpd/branches/httpd-2.2-proxy/modules/proxy/mod_lbmethod_byrequests.c Wed May 6 16:01:37 2009
@@ -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 @@
* (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 @@
&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 */
-};
Modified: httpd/httpd/branches/httpd-2.2-proxy/modules/proxy/mod_lbmethod_bytraffic.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/httpd-2.2-proxy/modules/proxy/mod_lbmethod_bytraffic.c?rev=772335&r1=772334&r2=772335&view=diff
==============================================================================
--- httpd/httpd/branches/httpd-2.2-proxy/modules/proxy/mod_lbmethod_bytraffic.c (original)
+++ httpd/httpd/branches/httpd-2.2-proxy/modules/proxy/mod_lbmethod_bytraffic.c Wed May 6 16:01:37 2009
@@ -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 @@
return APR_SUCCESS;
}
-static const proxy_balancer_method bytraffic =
+const proxy_balancer_method proxy_balancer_bytraffic =
{
"bytraffic",
&find_best_bytraffic,
@@ -121,22 +119,3 @@
&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 */
-};