httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject cvs commit: httpd-2.0/modules/proxy proxy_connect.c
Date Thu, 11 Nov 2004 11:37:25 GMT
jorton      2004/11/11 03:37:25

  Modified:    modules/proxy proxy_connect.c
  Log:
  * modules/proxy/proxy_connect.c (proxy_connect_handler,
  proxy_connect_canon): Drop ap_ prefix, make static, remove
  forward-declarations.
  
  Revision  Changes    Path
  1.71      +8 -15     httpd-2.0/modules/proxy/proxy_connect.c
  
  Index: proxy_connect.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/proxy/proxy_connect.c,v
  retrieving revision 1.70
  retrieving revision 1.71
  diff -d -w -u -r1.70 -r1.71
  --- proxy_connect.c	28 Sep 2004 16:54:29 -0000	1.70
  +++ proxy_connect.c	11 Nov 2004 11:37:25 -0000	1.71
  @@ -22,12 +22,6 @@
   
   module AP_MODULE_DECLARE_DATA proxy_connect_module;
   
  -int ap_proxy_connect_canon(request_rec *r, char *url);
  -int ap_proxy_connect_handler(request_rec *r, proxy_worker *worker,
  -                             proxy_server_conf *conf, 
  -                             char *url, const char *proxyname, 
  -                             apr_port_t proxyport);
  -
   /*  
    * This handles Netscape CONNECT method secure proxy requests.
    * A connection is opened to the specified host and data is
  @@ -51,8 +45,7 @@
    * FIXME: no check for r->assbackwards, whatever that is.
    */
   
  -static int
  -allowed_port(proxy_server_conf *conf, int port)
  +static int allowed_port(proxy_server_conf *conf, int port)
   {
       int i;
       int *list = (int *) conf->allowed_connect_ports->elts;
  @@ -65,7 +58,7 @@
   }
   
   /* canonicalise CONNECT URLs. */
  -int ap_proxy_connect_canon(request_rec *r, char *url)
  +static int proxy_connect_canon(request_rec *r, char *url)
   {
   
       if (r->method_number != M_CONNECT) {
  @@ -78,7 +71,7 @@
   }
   
   /* CONNECT handler */
  -int ap_proxy_connect_handler(request_rec *r, proxy_worker *worker,
  +static int proxy_connect_handler(request_rec *r, proxy_worker *worker,
                                proxy_server_conf *conf, 
                                char *url, const char *proxyname, 
                                apr_port_t proxyport)
  @@ -390,8 +383,8 @@
   
   static void ap_proxy_connect_register_hook(apr_pool_t *p)
   {
  -    proxy_hook_scheme_handler(ap_proxy_connect_handler, NULL, NULL, APR_HOOK_MIDDLE);
  -    proxy_hook_canon_handler(ap_proxy_connect_canon, NULL, NULL, APR_HOOK_MIDDLE);
  +    proxy_hook_scheme_handler(proxy_connect_handler, NULL, NULL, APR_HOOK_MIDDLE);
  +    proxy_hook_canon_handler(proxy_connect_canon, NULL, NULL, APR_HOOK_MIDDLE);
   }
   
   module AP_MODULE_DECLARE_DATA proxy_connect_module = {
  
  
  

Mime
View raw message