Blame SOURCES/httpd-2.4.6-CVE-2014-3581.patch
|
 |
75a229 |
diff --git a/modules/cache/cache_util.c b/modules/cache/cache_util.c
|
|
|
75a229 |
index 7b7fb45..fbebb1e 100644
|
|
|
75a229 |
--- a/modules/cache/cache_util.c
|
|
|
75a229 |
+++ b/modules/cache/cache_util.c
|
|
|
75a229 |
@@ -1251,8 +1251,10 @@ CACHE_DECLARE(apr_table_t *)ap_cache_cacheable_headers_out(request_rec *r)
|
|
|
75a229 |
|
|
|
75a229 |
if (!apr_table_get(headers_out, "Content-Type")
|
|
|
75a229 |
&& r->content_type) {
|
|
|
75a229 |
- apr_table_setn(headers_out, "Content-Type",
|
|
|
75a229 |
- ap_make_content_type(r, r->content_type));
|
|
|
75a229 |
+ const char *ctype = ap_make_content_type(r, r->content_type);
|
|
|
75a229 |
+ if (ctype) {
|
|
|
75a229 |
+ apr_table_setn(headers_out, "Content-Type", ctype);
|
|
|
75a229 |
+ }
|
|
|
75a229 |
}
|
|
|
75a229 |
|
|
|
75a229 |
if (!apr_table_get(headers_out, "Content-Encoding")
|