View | Details | Raw Unified | Return to bug 56924
Collapse All | Expand All

(-)httpd-2.4.10/modules/cache/cache_util.c.fix (-2 / +4 lines)
Lines 1258-1265 apr_table_t *cache_merge_headers_out(req Link Here
1258
1258
1259
    if (r->content_type
1259
    if (r->content_type
1260
            && !apr_table_get(headers_out, "Content-Type")) {
1260
            && !apr_table_get(headers_out, "Content-Type")) {
1261
        apr_table_setn(headers_out, "Content-Type",
1261
        const char *ctype = ap_make_content_type(r, r->content_type);
1262
                       ap_make_content_type(r, r->content_type));
1262
        if (ctype) {
1263
            apr_table_setn(headers_out, "Content-Type", ctype);
1264
        }
1263
    }
1265
    }
1264
1266
1265
    if (r->content_encoding
1267
    if (r->content_encoding
(-)httpd-2.4.10/server/util_script.c.fix (-1 / +4 lines)
Lines 575-581 AP_DECLARE(int) ap_scan_script_header_er Link Here
575
575
576
            /* Nuke trailing whitespace */
576
            /* Nuke trailing whitespace */
577
577
578
            char *endp = l + strlen(l) - 1;
578
            char *endp = l;
579
            if (*endp != '\0') {
580
                endp += strlen(l) - 1;
581
            }
579
            while (endp > l && apr_isspace(*endp)) {
582
            while (endp > l && apr_isspace(*endp)) {
580
                *endp-- = '\0';
583
                *endp-- = '\0';
581
            }
584
            }

Return to bug 56924