svn commit: r151815 - in httpd/httpd/trunk: CHANGES modules/cache/mod_disk_cache.c

[je...@apache.org]

Author: jerenkrantz
Date: Mon Feb  7 18:01:46 2005
New Revision: 151815

URL: http://svn.apache.org/viewcvs?view=rev&rev=151815
Log:
* modules/cache/mod_disk_cache.c: Properly load cached ETag from on-disk
structures.

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

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/CHANGES?view=diff&r1=151814&r2=151815
==============================================================================
--- httpd/httpd/trunk/CHANGES (original)
+++ httpd/httpd/trunk/CHANGES Mon Feb  7 18:01:46 2005
@@ -2,6 +2,9 @@
 
   [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.

Modified: httpd/httpd/trunk/modules/cache/mod_disk_cache.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/cache/mod_disk_cache.c?view=diff&r1=151814&r2=151815
==============================================================================
--- httpd/httpd/trunk/modules/cache/mod_disk_cache.c (original)
+++ httpd/httpd/trunk/modules/cache/mod_disk_cache.c Mon Feb  7 18:01:46 2005
@@ -481,6 +481,7 @@
 
     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);