httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n.@apache.org
Subject cvs commit: httpd-2.0/modules/proxy mod_proxy.c proxy_balancer.c
Date Thu, 26 Aug 2004 21:10:01 GMT
nd          2004/08/26 14:10:01

  Modified:    modules/proxy mod_proxy.c proxy_balancer.c
  Log:
  remove unused variables and fix some compiler warnings about const
  qualifiers
  
  Revision  Changes    Path
  1.137     +1 -1      httpd-2.0/modules/proxy/mod_proxy.c
  
  Index: mod_proxy.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/proxy/mod_proxy.c,v
  retrieving revision 1.136
  retrieving revision 1.137
  diff -u -u -r1.136 -r1.137
  --- mod_proxy.c	26 Aug 2004 06:49:21 -0000	1.136
  +++ mod_proxy.c	26 Aug 2004 21:10:01 -0000	1.137
  @@ -1359,7 +1359,7 @@
            * Parent directive arg is the worker/balancer name.
            */
           name = ap_getword_conf(cmd->temp_pool, &pargs);
  -        if ((word = ap_strchr_c(name, '>')))
  +        if ((word = ap_strchr(name, '>')))
               *word = '\0';
       }
       else {
  
  
  
  1.14      +2 -4      httpd-2.0/modules/proxy/proxy_balancer.c
  
  Index: proxy_balancer.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/proxy/proxy_balancer.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -u -r1.13 -r1.14
  --- proxy_balancer.c	26 Aug 2004 06:53:39 -0000	1.13
  +++ proxy_balancer.c	26 Aug 2004 21:10:01 -0000	1.14
  @@ -427,8 +427,6 @@
       void *sconf = r->server->module_config;
       proxy_server_conf *conf = (proxy_server_conf *)
           ap_get_module_config(sconf, &proxy_module);
  -    apr_array_header_t *proxies = conf->proxies;
  -    struct proxy_remote *ents = (struct proxy_remote *)proxies->elts;
       proxy_balancer *balancer, *bsel = NULL;
       proxy_runtime_worker *worker, *wsel = NULL;
       apr_table_t *params = apr_table_make(r->pool, 10);
  @@ -447,9 +445,9 @@
           char *args = apr_pstrdup(r->pool, r->args);
           char *tok, *val;
           while (args && *args) {
  -            if ((val = ap_strchr_c(args, '='))) {
  +            if ((val = ap_strchr(args, '='))) {
                   *val++ = '\0';
  -                if ((tok = ap_strchr_c(val, '&')))
  +                if ((tok = ap_strchr(val, '&')))
                       *tok++ = '\0';
                   if ((access_status = ap_unescape_url(val)) != OK)
                       return access_status;
  
  
  

Mime
View raw message