From: Jeff Trawick <trawick@apache.org>
Date: Fri, 20 Aug 2010 20:47:35 +0000 (+0000)
Subject: follow up r987629 with another similar issue
X-Git-Tag: 2.3.8~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=105ce3617b0caff1fe2a90415827e9f62694cdd0;p=apache

follow up r987629 with another similar issue

curr_parent can't be NULL (or we segfault elsewhere), so
don't check for NULL


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

diff --git a/server/config.c b/server/config.c
index 0549782ff2..b58f096939 100644
--- a/server/config.c
+++ b/server/config.c
@@ -1182,7 +1182,7 @@ AP_DECLARE(const char *) ap_build_cont_config(apr_pool_t *p,
         if (retval != NULL)
             return retval;
 
-        if (sub_tree == NULL && curr_parent != NULL) {
+        if (sub_tree == NULL) {
             sub_tree = *curr_parent;
         }