httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerenkra...@apache.org
Subject cvs commit: httpd-2.0/modules/experimental mod_disk_cache.c
Date Tue, 28 Sep 2004 16:17:38 GMT
jerenkrantz    2004/09/28 09:17:38

  Modified:    .        CHANGES
               modules/experimental mod_disk_cache.c
  Log:
  mod_disk_cache: Correctly store cached content type.
  
  PR: 30278
  Submitted by:	Rüdiger Plüm <r.pluem t-online.de>
  Reviewed by:	Justin Erenkrantz
  
  Revision  Changes    Path
  1.1601    +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.1600
  retrieving revision 1.1601
  diff -u -u -r1.1600 -r1.1601
  --- CHANGES	24 Sep 2004 14:30:08 -0000	1.1600
  +++ CHANGES	28 Sep 2004 16:17:37 -0000	1.1601
  @@ -2,6 +2,9 @@
   
     [Remove entries to the current 2.0 section below, when backported]
   
  +  *) mod_disk_cache: Correctly store cached content type.  PR 30278.
  +     [Rüdiger Plüm <r.pluem t-online.de>]
  +
     *) Fix a segfault in the LDAP cache purge. [Jess Holle <jessh ptc.com>]
   
     *) mod_rewrite: Handle per-location rules when r->filename is unset.
  
  
  
  1.63      +6 -5      httpd-2.0/modules/experimental/mod_disk_cache.c
  
  Index: mod_disk_cache.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/experimental/mod_disk_cache.c,v
  retrieving revision 1.62
  retrieving revision 1.63
  diff -u -u -r1.62 -r1.63
  --- mod_disk_cache.c	22 Sep 2004 22:28:54 -0000	1.62
  +++ mod_disk_cache.c	28 Sep 2004 16:17:38 -0000	1.63
  @@ -613,16 +613,17 @@
   
               headers_out = ap_cache_cacheable_hdrs_out(r->pool, r->headers_out);
   
  +            if (!apr_table_get(headers_out, "Content-Type") &&
  +                r->content_type) {
  +                apr_table_setn(headers_out, "Content-Type",
  +                               ap_make_content_type(r, r->content_type));
  +            }
  +
               rv = store_table(dobj->hfd, headers_out);
               if (rv != APR_SUCCESS) {
                   return rv;
               }
   
  -            /* This case only occurs when the content is generated locally */
  -            if (!apr_table_get(r->headers_out, "Content-Type") && r->content_type)
{
  -                apr_table_setn(r->headers_out, "Content-Type",
  -                               ap_make_content_type(r, r->content_type));
  -            }
           }
   
           /* Parse the vary header and dump those fields from the headers_in. */
  
  
  

Mime
View raw message