1
0
mirror of https://github.com/apache/httpd.git synced 2025-11-14 01:22:37 +03:00

mod_cache: follow up to r1594643.

Avoid table lookup if not necessary (fast path first).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1594648 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yann Ylavic
2014-05-14 17:34:05 +00:00
parent baf4f92af0
commit be383e6c93

View File

@@ -1256,14 +1256,14 @@ apr_table_t *cache_merge_headers_out(request_rec *r)
r->err_headers_out); r->err_headers_out);
apr_table_clear(r->err_headers_out); apr_table_clear(r->err_headers_out);
if (!apr_table_get(headers_out, "Content-Type") if (r->content_type
&& r->content_type) { && !apr_table_get(headers_out, "Content-Type")) {
apr_table_setn(headers_out, "Content-Type", apr_table_setn(headers_out, "Content-Type",
ap_make_content_type(r, r->content_type)); ap_make_content_type(r, r->content_type));
} }
if (!apr_table_get(headers_out, "Content-Encoding") if (r->content_encoding
&& r->content_encoding) { && !apr_table_get(headers_out, "Content-Encoding")) {
apr_table_setn(headers_out, "Content-Encoding", apr_table_setn(headers_out, "Content-Encoding",
r->content_encoding); r->content_encoding);
} }