Sync with trunk; remove a now unused variable, and fix a comment.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@293310 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/cache/cache_storage.c b/modules/cache/cache_storage.c
index 9c75db2997bd59cf9f4c158a827b08d041469d16..8c83149306170d6105d13ca284b57dd9ce8541e3 100644 (file)
--- a/modules/cache/cache_storage.c
+++ b/modules/cache/cache_storage.c
@@ -245,7 +245,7 @@ int cache_select(request_rec *r)
                     /* headers do not match, so Vary failed */
                     ap_log_error(APLOG_MARK, APLOG_DEBUG, APR_SUCCESS,
                                 r->server,
-                                "cache_select(): Vary header mismatch.");
+                                "cache_select_url(): Vary header mismatch.");
                     return DECLINED;
                 }
             }

diff --git a/modules/cache/mod_cache.h b/modules/cache/mod_cache.h
index 520ee655912ad860c023c4c95c77223f07d0fcf2..0e16e19580b2ca7bd1f9310af1309391abf083c3 100644 (file)
--- a/modules/cache/mod_cache.h
+++ b/modules/cache/mod_cache.h
@@ -111,7 +111,6 @@
 struct cache_enable {
     apr_uri_t url;
     const char *type;
-    apr_size_t urllen;
     apr_size_t pathlen;
 };