Skip to content

Commit e54735b

Browse files
committed
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
1 parent 3dffb29 commit e54735b

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

server/core.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -624,10 +624,6 @@ static void *merge_core_server_configs(apr_pool_t *p, void *basev, void *virtv)
624624
? virt->flush_max_pipelined
625625
: base->flush_max_pipelined;
626626

627-
conf->strict_host_check = (virt->strict_host_check != AP_CORE_CONFIG_UNSET)
628-
? virt->strict_host_check
629-
: base->strict_host_check;
630-
631627
AP_CORE_MERGE_FLAG(strict_host_check, conf, base, virt);
632628
AP_CORE_MERGE_FLAG(merge_slashes, conf, base, virt);
633629

0 commit comments

Comments
 (0)