fix a bunch of compiler warnings

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

diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c
index c0bb0a7992c2b520e99e1bad47fe7aaf2cca039e..69be7e468e9f9a3ba1b99ae7aea7134907850e67 100644 (file)
--- a/modules/proxy/mod_proxy.c
+++ b/modules/proxy/mod_proxy.c
@@ -177,12 +177,13 @@ static int proxy_detect(request_rec *r)
 
 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 @@ static void register_hooks(apr_pool_t *p)
     /* 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);

diff --git a/modules/proxy/proxy_http.c b/modules/proxy/proxy_http.c
index e54f272499b60306b8e791260556be5608ae2479..d02a70443ef915dca29080d472f0d71a67651770 100644 (file)
--- a/modules/proxy/proxy_http.c
+++ b/modules/proxy/proxy_http.c
@@ -144,9 +144,9 @@ static const char *proxy_cookie_reverse_map(request_rec *r,
     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 @@ static const char *proxy_cookie_reverse_map(request_rec *r,
     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 @@ static const char *proxy_cookie_reverse_map(request_rec *r,
     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 @@ apr_status_t ap_proxy_http_process_response(apr_pool_t * p, request_rec *r,
              * 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);