--- httpd-2.4.10/modules/cache/cache_util.c.fix	2014-09-08 00:15:50.421893456 -0400
+++ httpd-2.4.10/modules/cache/cache_util.c.fix	2014-09-08 00:17:41.339598981 -0400
@@ -1258,8 +1258,10 @@ apr_table_t *cache_merge_headers_out(req
 
     if (r->content_type
             && !apr_table_get(headers_out, "Content-Type")) {
-        apr_table_setn(headers_out, "Content-Type",
-                       ap_make_content_type(r, r->content_type));
+        const char *ctype = ap_make_content_type(r, r->content_type);
+        if (ctype) {
+            apr_table_setn(headers_out, "Content-Type", ctype);
+        }
     }
 
     if (r->content_encoding
--- httpd-2.4.10/server/util_script.c.fix	2014-09-08 00:12:56.094505448 -0400
+++ httpd-2.4.10/server/util_script.c.fix	2014-09-08 00:15:28.534729354 -0400
@@ -575,7 +575,10 @@ AP_DECLARE(int) ap_scan_script_header_er
 
             /* Nuke trailing whitespace */
 
-            char *endp = l + strlen(l) - 1;
+            char *endp = l;
+            if (*endp != '\0') {
+                endp += strlen(l) - 1;
+            }
             while (endp > l && apr_isspace(*endp)) {
                 *endp-- = '\0';
             }