Skip to content

Followup to commit 64e605c2d2d81bd7288aa19e028287fae5ee998b #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
YoshikiHigo wants to merge 1 commit into from
Closed

Followup to commit 64e605c2d2d81bd7288aa19e028287fae5ee998b #21

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions modules/cache/mod_cache.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -903,8 +903,11 @@ static apr_status_t cache_save_filter(ap_filter_t *f, apr_bucket_brigade *in)

r->headers_out = cache->stale_handle->resp_hdrs;

ap_set_content_type(r, apr_table_get(
cache->stale_handle->resp_hdrs, "Content-Type"));
const char *ct = apr_table_get(
cache->stale_handle->resp_hdrs, "Content-Type");
if (ct) {
ap_set_content_type(r, ct);
}

/* add a revalidation warning */
warn_head = apr_table_get(r->err_headers_out, "Warning");
Expand Down Expand Up @@ -985,8 +988,11 @@ static apr_status_t cache_save_filter(ap_filter_t *f, apr_bucket_brigade *in)
* Content-Type based on the r->filename. This would lead to original
* Content-Type to be lost (overwriten by whatever mod_mime generates).
* We preserves the original Content-Type here. */
ap_set_content_type(r, apr_table_get(
cache->stale_handle->resp_hdrs, "Content-Type"));
const char *ct = apr_table_get(
cache->stale_handle->resp_hdrs, "Content-Type");
if (ct) {
ap_set_content_type(r, ct);
}
}

/* Parse the cache control header */
Expand Down