From: Paul J. Reder <rederpj@apache.org>
Date: Thu, 11 Sep 2003 18:24:26 +0000 (+0000)
Subject: Fix a couple of AIX xlc_r compiler issues in the cache code I previously
X-Git-Tag: pre_ajp_proxy~1167
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=765970fa46f3c818916bde7f156942c592ee761b;p=apache

Fix a couple of AIX xlc_r compiler issues in the cache code I previously
committed. [Paul J. Reder]


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

diff --git a/CHANGES b/CHANGES
index 8da3d830d9..3324821d42 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) Fix a couple of AIX xlc_r compiler issues in the code I just
+     committed. [Paul J. Reder]
+
   *) Modified the cache code to be header-location agnostic. Also
      fixed a number of other cache code bugs related to PR 15852.
      Includes a patch submitted by Sushma Rai <rsushma@novell.com>.
diff --git a/modules/experimental/cache_storage.c b/modules/experimental/cache_storage.c
index 4f8b703d50..3e5c83faae 100644
--- a/modules/experimental/cache_storage.c
+++ b/modules/experimental/cache_storage.c
@@ -187,7 +187,7 @@ int cache_select_url(request_rec *r, const char *types, char *url)
         switch ((rv = cache_run_open_entity(h, r, type, key))) {
         case OK: {
             char *vary = NULL;
-            char *varyhdr = NULL;
+            const char *varyhdr = NULL;
             if (cache_read_entity_headers(h, r) != APR_SUCCESS) {
                 /* TODO: Handle this error */
                 return DECLINED;
diff --git a/modules/experimental/mod_cache.c b/modules/experimental/mod_cache.c
index 8828b45e2e..6a7d0004af 100644
--- a/modules/experimental/mod_cache.c
+++ b/modules/experimental/mod_cache.c
@@ -799,7 +799,7 @@ static int cache_in_filter(ap_filter_t *f, apr_bucket_brigade *in)
 
     info->content_type = apr_pstrdup(r->pool, r->content_type);
     info->etag = apr_pstrdup(r->pool, etag);
-    info->lastmod = apr_pstrdup(r->pool, lastmods);
+    info->lastmods = apr_pstrdup(r->pool, lastmods);
     info->filename = apr_pstrdup(r->pool, r->filename );
 
     /*