Commit 89b823e1 authored by Bill Stoddard's avatar Bill Stoddard
Browse files

Fix problem where mod_cache/mod_disk_cache was setting content_type to

text/plain for all cached remote responses.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95319 13f79535-47bb-0310-9956-ffa450edef68
parent 93595e99
Loading
Loading
Loading
Loading
+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
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
+0 −1
Changes for modules/experimental/cache_storage.c: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -237,7 +237,6 @@ apr_status_t cache_read_entity_headers(cache_handle_t *h, request_rec *r)
        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;
+6 −0
Changes for modules/experimental/mod_mem_cache.c: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -648,6 +648,12 @@ static apr_status_t read_headers(cache_handle_t *h, request_rec *r)
    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;
}