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_http.c
Date Sat, 03 Jul 2004 16:23:10 GMT
nd          2004/07/03 09:23:10

  Modified:    modules/proxy mod_proxy.c proxy_http.c
  Log:
  fix a bunch of compiler warnings
  
  Revision  Changes    Path
  1.101     +4 -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.100
  retrieving revision 1.101
  diff -u -u -r1.100 -r1.101
  --- mod_proxy.c	29 Jun 2004 06:37:21 -0000	1.100
  +++ mod_proxy.c	3 Jul 2004 16:23:09 -0000	1.101
  @@ -177,12 +177,13 @@
   
   static int proxy_trans(request_rec *r)
   {
  +#ifndef FIX_15207
       void *sconf = r->server->module_config;
       proxy_server_conf *conf =
       (proxy_server_conf *) ap_get_module_config(sconf, &proxy_module);
       int i, len;
       struct proxy_alias *ent = (struct proxy_alias *) conf->aliases->elts;
  -
  +#endif
       if (r->proxyreq) {
           /* someone has already set up the proxy, it was possibly ourselves
            * in proxy_detect
  @@ -1175,7 +1176,9 @@
       /* fixup before mod_rewrite, so that the proxied url will not
        * escaped accidentally by our fixup.
        */
  +#ifndef FIX_15207
       static const char * const aszSucc[]={ "mod_rewrite.c", NULL };
  +#endif
   
       /* handler */
       ap_hook_handler(proxy_handler, NULL, NULL, APR_HOOK_FIRST);
  
  
  
  1.189     +6 -6      httpd-2.0/modules/proxy/proxy_http.c
  
  Index: proxy_http.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/proxy/proxy_http.c,v
  retrieving revision 1.188
  retrieving revision 1.189
  diff -u -u -r1.188 -r1.189
  --- proxy_http.c	29 Jun 2004 14:00:07 -0000	1.188
  +++ proxy_http.c	3 Jul 2004 16:23:09 -0000	1.189
  @@ -144,9 +144,9 @@
       const char* newdomain = NULL ;
       const char* pathp ;
       const char* domainp ;
  -    const char* pathe ;
  -    const char* domaine ;
  -    size_t l1, l2, i, poffs, doffs ;
  +    const char* pathe = NULL;
  +    const char* domaine = NULL;
  +    size_t l1, l2, i, poffs = 0, doffs = 0 ;
       int ddiff = 0 ;
       int pdiff = 0 ;
       char* ret ;
  @@ -157,7 +157,7 @@
       if ( pathp = apr_strmatch(conf->cookie_path_str, str, len) , pathp ) {
           pathp += 5 ;
           poffs = pathp - str ;
  -        pathe = strchr(pathp, ';') ;
  +        pathe = ap_strchr_c(pathp, ';') ;
           l1 = pathe ? (pathe-pathp) : strlen(pathp) ;
           pathe = pathp + l1 ;
           ent = (struct proxy_alias *)conf->cookie_paths->elts;
  @@ -173,7 +173,7 @@
       if ( domainp = apr_strmatch(conf->cookie_domain_str, str, len) , domainp ) {
           domainp += 7 ;
           doffs = domainp - str ;
  -        domaine = strchr(domainp, ';') ;
  +        domaine = ap_strchr_c(domainp, ';') ;
           l1 = domaine ? (domaine-domainp) : strlen(domainp) ;
           domaine = domainp + l1 ;
           ent = (struct proxy_alias *)conf->cookie_domains->elts;
  @@ -1197,7 +1197,7 @@
                * decide on the conversion of this buffer full of data.
                * However, chances are that we are not really talking to an
                * HTTP/0.9 server, but to some different protocol, therefore
  -             * the best guess IMHO is to always treat the buffer as "text/*":
  +             * the best guess IMHO is to always treat the buffer as "text/x":
                */
               ap_xlate_proto_to_ascii(buffer, len);
               e = apr_bucket_heap_create(buffer, cntr, NULL, c->bucket_alloc);
  
  
  

Mime
View raw message