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 8da3d830d92d1f314f960765b93aa62a3333cf23..3324821d42f7e8bf13806410a7014f2c961aecb6 100644 (file)
--- 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 4f8b703d505cfbec4a705c089ab49f34128cdf76..3e5c83faae5c266a0ace735d88f8465e1be6b9df 100644 (file)
--- 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 8828b45e2e823a774591d2f504c54af9f86512bd..6a7d0004af7c0f1067cf9a3d7a4f0432d386c0cd 100644 (file)
--- 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 );
 
     /*