From: Ruediger Pluem <rpluem@apache.org>
Date: Sat, 18 Oct 2025 10:34:37 +0000 (+0000)
Subject: Remove duplicate config merging
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e54735bf82e02278dc70eb80d931a748a81e8ce8;p=thirdparty%2Fapache%2Fhttpd.git

Remove duplicate config merging

The removed ternary does the same as the following macro
call to AP_CORE_MERGE_FLAG.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1929201 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/server/core.c b/server/core.c
index f17113b2b8..11e8a821c7 100644
--- a/server/core.c
+++ b/server/core.c
@@ -624,10 +624,6 @@ static void *merge_core_server_configs(apr_pool_t *p, void *basev, void *virtv)
                                   ? virt->flush_max_pipelined
                                   : base->flush_max_pipelined;
 
-    conf->strict_host_check = (virt->strict_host_check != AP_CORE_CONFIG_UNSET)
-                              ? virt->strict_host_check 
-                              : base->strict_host_check;
-
     AP_CORE_MERGE_FLAG(strict_host_check, conf, base, virt);
     AP_CORE_MERGE_FLAG(merge_slashes, conf, base, virt);