* modules/cache/mod_disk_cache.c: Properly load cached ETag from on-disk

structures.

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

diff --git a/CHANGES b/CHANGES
index b19d2a46385d6cd3010560b3a601e569e90b697c..c5a3788148f46f101c9655c931a97a070d3b7fb4 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@ Changes with Apache 2.1.3
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) mod_disk_cache: Properly load cached ETag from on-disk structures.
+     [Justin Erenkrantz]
+
   *) mod_authnz_ldap: Added an optional second parameter to AuthLDAPURL
      to allow it to override the connection type set in mod_ldap. This
      parameter can be set to NONE, SSL or TLS | STARTTLS.

diff --git a/modules/cache/mod_disk_cache.c b/modules/cache/mod_disk_cache.c
index e42c3728247b00734ec87d7e5806160224fdef15..94717a2e3af060968435c6551ee635e705efe6c9 100644 (file)
--- a/modules/cache/mod_disk_cache.c
+++ b/modules/cache/mod_disk_cache.c
@@ -481,6 +481,7 @@ static apr_status_t recall_headers(cache_handle_t *h, request_rec *r)
 
     h->status = dobj->disk_info.status;
     h->content_type = apr_table_get(h->resp_hdrs, "Content-Type");
+    h->cache_obj->info.etag = apr_table_get(h->resp_hdrs, "ETag");
 
     ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
                  "disk_cache: Recalled headers for URL %s",  dobj->name);