Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 64556 invoked from network); 14 Sep 2004 17:29:42 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 14 Sep 2004 17:29:42 -0000 Received: (qmail 1524 invoked by uid 500); 14 Sep 2004 17:29:40 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 1389 invoked by uid 500); 14 Sep 2004 17:29:38 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 1368 invoked by uid 500); 14 Sep 2004 17:29:38 -0000 Delivered-To: apmail-httpd-2.0-cvs@apache.org Received: (qmail 1356 invoked by uid 99); 14 Sep 2004 17:29:38 -0000 X-ASF-Spam-Status: No, hits=-2.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Tue, 14 Sep 2004 10:29:37 -0700 Received: (qmail 64493 invoked by uid 1582); 14 Sep 2004 17:29:36 -0000 Date: 14 Sep 2004 17:29:36 -0000 Message-ID: <20040914172936.64492.qmail@minotaur.apache.org> From: jorton@apache.org To: httpd-2.0-cvs@apache.org Subject: cvs commit: httpd-2.0/modules/proxy proxy_ajp.c X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N jorton 2004/09/14 10:29:36 Modified: modules/proxy proxy_ajp.c Log: * modules/proxy/proxy_ajp.c (proxy_ajp_handler, proxy_ajp_canon): Drop ap_ prefix, declarations and make static. Revision Changes Path 1.22 +7 -14 httpd-2.0/modules/proxy/proxy_ajp.c Index: proxy_ajp.c =================================================================== RCS file: /home/cvs/httpd-2.0/modules/proxy/proxy_ajp.c,v retrieving revision 1.21 retrieving revision 1.22 diff -d -w -u -r1.21 -r1.22 --- proxy_ajp.c 13 Sep 2004 11:13:28 -0000 1.21 +++ proxy_ajp.c 14 Sep 2004 17:29:36 -0000 1.22 @@ -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,7 +343,7 @@ * 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, +static int proxy_ajp_handler(request_rec *r, proxy_worker *worker, proxy_server_conf *conf, char *url, const char *proxyname, apr_port_t proxyport) @@ -460,8 +453,8 @@ 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 = {