svn commit: r408154 - in /httpd/httpd/trunk: CHANGES modules/cache/cache_storage.c

[rp...@apache.org]

Author: rpluem
Date: Sun May 21 03:29:09 2006
New Revision: 408154

URL: http://svn.apache.org/viewvc?rev=408154&view=rev
Log:
* Fix const compiler warning introduced by r407357.

Noticed by: Joe Orton

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/modules/cache/cache_storage.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=408154&r1=408153&r2=408154&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Sun May 21 03:29:09 2006
@@ -3,7 +3,7 @@
   [Remove entries to the current 2.0 and 2.2 section below, when backported]
 
   *) mod_cache: Make caching of reverse SSL proxies possible again. PR 39593.
-     [Ruediger Pluem]
+     [Ruediger Pluem, Joe Orton]
 
   *) Add support for fcgi:// proxies to mod_rewrite.
      [Markus Schiegl <ms schiegl.com>]

Modified: httpd/httpd/trunk/modules/cache/cache_storage.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/cache_storage.c?rev=408154&r1=408153&r2=408154&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/cache_storage.c (original)
+++ httpd/httpd/trunk/modules/cache/cache_storage.c Sun May 21 03:29:09 2006
@@ -320,8 +320,8 @@
 apr_status_t cache_generate_key_default(request_rec *r, apr_pool_t* p,
                                         char**key)
 {
-    char *port_str, *scheme, *hn;
-    const char * hostname;
+    char *port_str, *hn, *lcs;
+    const char *hostname, *scheme;
     int i;
 
     /*
@@ -373,11 +373,13 @@
      * manner (see above why this is needed).
      */
     if (r->proxyreq && r->parsed_uri.scheme) {
-        /* Copy the scheme */
-        scheme = apr_pcalloc(p, strlen(r->parsed_uri.scheme) + 1);
+        /* Copy the scheme and lower-case it */
+        lcs = apr_pcalloc(p, strlen(r->parsed_uri.scheme) + 1);
         for (i = 0; r->parsed_uri.scheme[i]; i++) {
-            scheme[i] = apr_tolower(r->parsed_uri.scheme[i]);
+            lcs[i] = apr_tolower(r->parsed_uri.scheme[i]);
         }
+        /* const work-around */
+        scheme = lcs;
     }
     else {
         scheme = ap_http_scheme(r);