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

(-)proxy_http.c.old (-2 / +3 lines)
Lines 1304-1311 Link Here
1304
            /* N.B. for HTTP/1.0 clients, we have to fold line-wrapped headers*/
1304
            /* N.B. for HTTP/1.0 clients, we have to fold line-wrapped headers*/
1305
            /* Also, take care with headers with multiple occurences. */
1305
            /* Also, take care with headers with multiple occurences. */
1306
1306
1307
            r->headers_out = ap_proxy_read_headers(r, rp, buffer,
1307
	    /* Keep the possibly pre-existing headers (pre-mod_proxy) */
1308
                                                   sizeof(buffer), origin);
1308
            apr_table_overlap(r->headers_out,ap_proxy_read_headers(r, rp, buffer,
1309
			      sizeof(buffer), origin),APR_OVERLAP_TABLES_MERGE);
1309
            if (r->headers_out == NULL) {
1310
            if (r->headers_out == NULL) {
1310
                ap_log_error(APLOG_MARK, APLOG_WARNING, 0,
1311
                ap_log_error(APLOG_MARK, APLOG_WARNING, 0,
1311
                             r->server, "proxy: bad HTTP/%d.%d header "
1312
                             r->server, "proxy: bad HTTP/%d.%d header "

Return to bug 25543