From be383e6c93ec906fec064bd61d2ded3f44f36e4c Mon Sep 17 00:00:00 2001 From: Yann Ylavic Date: Wed, 14 May 2014 17:34:05 +0000 Subject: [PATCH] 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 --- modules/cache/cache_util.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/cache/cache_util.c b/modules/cache/cache_util.c index 05cd3e09c9..bf45093192 100644 --- a/modules/cache/cache_util.c +++ b/modules/cache/cache_util.c @@ -1256,14 +1256,14 @@ apr_table_t *cache_merge_headers_out(request_rec *r) r->err_headers_out); apr_table_clear(r->err_headers_out); - if (!apr_table_get(headers_out, "Content-Type") - && r->content_type) { + 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)); } - if (!apr_table_get(headers_out, "Content-Encoding") - && r->content_encoding) { + if (r->content_encoding + && !apr_table_get(headers_out, "Content-Encoding")) { apr_table_setn(headers_out, "Content-Encoding", r->content_encoding); } -- 2.50.1