From: Joe Orton <jorton@apache.org>
Date: Tue, 14 Sep 2004 18:54:32 +0000 (+0000)
Subject: * modules/proxy/proxy_http.c (proxy_http_handler, proxy_http_canon):
X-Git-Tag: 2.1.1~267
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3a008cdd6104360cbc72d72912760fe7e0bfb994;p=apache

* modules/proxy/proxy_http.c (proxy_http_handler, proxy_http_canon):
Drop ap_ prefix, declarations and make static.


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

diff --git a/modules/proxy/proxy_http.c b/modules/proxy/proxy_http.c
index e112e7e253..d1b960d71a 100644
--- a/modules/proxy/proxy_http.c
+++ b/modules/proxy/proxy_http.c
@@ -19,12 +19,6 @@
 
 module AP_MODULE_DECLARE_DATA proxy_http_module;
 
-int ap_proxy_http_canon(request_rec *r, char *url);
-int ap_proxy_http_handler(request_rec *r, proxy_worker *worker,
-                          proxy_server_conf *conf,
-                          char *url, const char *proxyname, 
-                          apr_port_t proxyport);
-
 static apr_status_t ap_proxy_http_cleanup(const char *scheme,
                                           request_rec *r,
                                           proxy_conn_rec *backend);
@@ -35,7 +29,7 @@ static apr_status_t ap_proxy_http_cleanup(const char *scheme,
  *  url    is the URL starting with the first '/'
  *  def_port is the default port for this scheme.
  */
-int ap_proxy_http_canon(request_rec *r, char *url)
+static int proxy_http_canon(request_rec *r, char *url)
 {
     char *host, *path, *search, sport[7];
     const char *err;
@@ -1131,10 +1125,10 @@ apr_status_t ap_proxy_http_cleanup(const char *scheme, request_rec *r,
  * we return DECLINED so that we can try another proxy. (Or the direct
  * route.)
  */
-int ap_proxy_http_handler(request_rec *r, proxy_worker *worker,
-                          proxy_server_conf *conf,
-                          char *url, const char *proxyname, 
-                          apr_port_t proxyport)
+static int proxy_http_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];
@@ -1266,8 +1260,8 @@ cleanup:
 
 static void ap_proxy_http_register_hook(apr_pool_t *p)
 {
-    proxy_hook_scheme_handler(ap_proxy_http_handler, NULL, NULL, APR_HOOK_FIRST);
-    proxy_hook_canon_handler(ap_proxy_http_canon, NULL, NULL, APR_HOOK_FIRST);
+    proxy_hook_scheme_handler(proxy_http_handler, NULL, NULL, APR_HOOK_FIRST);
+    proxy_hook_canon_handler(proxy_http_canon, NULL, NULL, APR_HOOK_FIRST);
 }
 
 module AP_MODULE_DECLARE_DATA proxy_http_module = {