From 60e15ba0e527ee529e515717c391fabb80339c55 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Tue, 14 Sep 2004 17:29:36 +0000 Subject: [PATCH] * modules/proxy/proxy_ajp.c (proxy_ajp_handler, proxy_ajp_canon): Drop ap_ prefix, declarations and make static. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105118 13f79535-47bb-0310-9956-ffa450edef68 --- modules/proxy/proxy_ajp.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/modules/proxy/proxy_ajp.c b/modules/proxy/proxy_ajp.c index ccf617b4ca..e09f484c63 100644 --- a/modules/proxy/proxy_ajp.c +++ b/modules/proxy/proxy_ajp.c @@ -19,20 +19,13 @@ #include "ajp.h" module AP_MODULE_DECLARE_DATA proxy_ajp_module; - -int ap_proxy_ajp_canon(request_rec *r, char *url); -int ap_proxy_ajp_handler(request_rec *r, proxy_worker *worker, - proxy_server_conf *conf, - char *url, const char *proxyname, - apr_port_t proxyport); - /* * Canonicalise http-like URLs. * scheme is the scheme for the URL * url is the URL starting with the first '/' * def_port is the default port for this scheme. */ -int ap_proxy_ajp_canon(request_rec *r, char *url) +static int proxy_ajp_canon(request_rec *r, char *url) { char *host, *path, *search, sport[7]; const char *err; @@ -350,10 +343,10 @@ static int ap_proxy_ajp_request(apr_pool_t *p, request_rec *r, * we return DECLINED so that we can try another proxy. (Or the direct * route.) */ -int ap_proxy_ajp_handler(request_rec *r, proxy_worker *worker, - proxy_server_conf *conf, - char *url, const char *proxyname, - apr_port_t proxyport) +static int proxy_ajp_handler(request_rec *r, proxy_worker *worker, + proxy_server_conf *conf, + char *url, const char *proxyname, + apr_port_t proxyport) { int status; char server_portstr[32]; @@ -460,8 +453,8 @@ cleanup: static void ap_proxy_http_register_hook(apr_pool_t *p) { - proxy_hook_scheme_handler(ap_proxy_ajp_handler, NULL, NULL, APR_HOOK_FIRST); - proxy_hook_canon_handler(ap_proxy_ajp_canon, NULL, NULL, APR_HOOK_FIRST); + proxy_hook_scheme_handler(proxy_ajp_handler, NULL, NULL, APR_HOOK_FIRST); + proxy_hook_canon_handler(proxy_ajp_canon, NULL, NULL, APR_HOOK_FIRST); } module AP_MODULE_DECLARE_DATA proxy_ajp_module = { -- 2.40.0