httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stodd...@apache.org
Subject cvs commit: httpd-2.0/modules/experimental cache_storage.c mod_mem_cache.c
Date Tue, 28 May 2002 18:04:43 GMT
stoddard    02/05/28 11:04:43

  Modified:    .        CHANGES
               modules/experimental cache_storage.c mod_mem_cache.c
  Log:
  Fix problem where mod_cache/mod_disk_cache was setting content_type to
  text/plain for all cached remote responses.
  
  Revision  Changes    Path
  1.791     +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.790
  retrieving revision 1.791
  diff -u -r1.790 -r1.791
  --- CHANGES	27 May 2002 11:46:01 -0000	1.790
  +++ CHANGES	28 May 2002 18:04:42 -0000	1.791
  @@ -1,4 +1,7 @@
   Changes with Apache 2.0.38
  +  *) Fix problem where mod_cache/mod_disk_cache was incorrectly
  +     stripping the content_type from cached responses.
  +     [Bill Stoddard]
   
     *) apachectl passes through any httpd options.  Note: apachectl
        should be used in preference to httpd since it ensures that any
  
  
  
  1.21      +0 -1      httpd-2.0/modules/experimental/cache_storage.c
  
  Index: cache_storage.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/experimental/cache_storage.c,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- cache_storage.c	20 Mar 2002 17:41:54 -0000	1.20
  +++ cache_storage.c	28 May 2002 18:04:43 -0000	1.21
  @@ -237,7 +237,6 @@
           return rv;
       }
   
  -    ap_set_content_type(r, apr_pstrdup(r->pool, info->content_type));
       r->filename = apr_pstrdup(r->pool, info->filename );
   
       return APR_SUCCESS;
  
  
  
  1.61      +6 -0      httpd-2.0/modules/experimental/mod_mem_cache.c
  
  Index: mod_mem_cache.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/experimental/mod_mem_cache.c,v
  retrieving revision 1.60
  retrieving revision 1.61
  diff -u -r1.60 -r1.61
  --- mod_mem_cache.c	24 May 2002 14:41:08 -0000	1.60
  +++ mod_mem_cache.c	28 May 2002 18:04:43 -0000	1.61
  @@ -648,6 +648,12 @@
       rc = unserialize_table( mobj->notes,
                               mobj->num_notes,
                               r->notes);
  +
  +    /* Content-Type: header may not be set if content is local since
  +     * CACHE_IN runs before header filters....
  +     */
  +    ap_set_content_type(r, apr_pstrdup(r->pool, h->cache_obj->info.content_type));
  +
       return rc;
   }
   
  
  
  

Mime
View raw message