VladPolskiy/apache-http-server
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-03 16:33:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use an optional function as adviced by Rüdiger.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1887359 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jean-Frederic Clere
2021-03-09 08:39:21 +00:00
parent 9cffa480fe
commit 6cbbf4f0b1
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/proxy/mod_proxy.h
View File

@ -1336,6 +1336,16 @@ PROXY_DECLARE(int) ap_proxy_tunnel_run(proxy_tunnel_rec *tunnel);
APR_DECLARE_OPTIONAL_FN(int, ap_proxy_clear_connection, APR_DECLARE_OPTIONAL_FN(int, ap_proxy_clear_connection,
(request_rec *r, apr_table_t *headers)); (request_rec *r, apr_table_t *headers));
/**
* Configure and create workers (and balancer) in mod_balancer.
* @param r request
* @param params table with the parameters like b=mycluster etc.
* @return 404 when the worker/balancer doesn't exist,
* 400 if something is invalid
* 200 for success.
*/
APR_DECLARE_OPTIONAL_FN(apr_status_t, balancer_manage,
(request_rec *, apr_table_t *params));
/** /**
* @param socket socket to test * @param socket socket to test

4
modules/proxy/mod_proxy_balancer.c
View File

@ -1378,7 +1378,7 @@ static int balancer_process_balancer_worker(request_rec *r, proxy_server_conf *c
/* /*
* Process a request for balancer or worker management from another module * Process a request for balancer or worker management from another module
*/ */
static int balancer_manage(request_rec *r, apr_table_t *params) static apr_status_t balancer_manage(request_rec *r, apr_table_t *params)
{ {
void *sconf; void *sconf;
proxy_server_conf *conf; proxy_server_conf *conf;
@ -2061,7 +2061,7 @@ static void ap_proxy_balancer_register_hook(apr_pool_t *p)
static const char *const aszPred[] = { "mpm_winnt.c", "mod_slotmem_shm.c", NULL}; static const char *const aszPred[] = { "mpm_winnt.c", "mod_slotmem_shm.c", NULL};
static const char *const aszPred2[] = { "mod_proxy.c", NULL}; static const char *const aszPred2[] = { "mod_proxy.c", NULL};
/* manager handler */ /* manager handler */
ap_register_provider(p, "balancer", "manager", "0", &balancer_manage); APR_REGISTER_OPTIONAL_FN(balancer_manage);
ap_hook_post_config(balancer_post_config, aszPred2, NULL, APR_HOOK_MIDDLE); ap_hook_post_config(balancer_post_config, aszPred2, NULL, APR_HOOK_MIDDLE);
ap_hook_pre_config(balancer_pre_config, NULL, NULL, APR_HOOK_MIDDLE); ap_hook_pre_config(balancer_pre_config, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_handler(balancer_handler, NULL, NULL, APR_HOOK_FIRST); ap_hook_handler(balancer_handler, NULL, NULL, APR_HOOK_FIRST);