You are viewing a plain text version of this content. The canonical link for it is here.

Posted to cvs@httpd.apache.org by tr...@apache.org on 2010/08/20 22:47:35 UTC

svn commit: r987631 - /httpd/httpd/trunk/server/config.c

Author: trawick
Date: Fri Aug 20 20:47:35 2010
New Revision: 987631

URL: http://svn.apache.org/viewvc?rev=987631&view=rev
Log:
follow up r987629 with another similar issue

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

Modified:
    httpd/httpd/trunk/server/config.c

Modified: httpd/httpd/trunk/server/config.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/config.c?rev=987631&r1=987630&r2=987631&view=diff
==============================================================================
--- httpd/httpd/trunk/server/config.c (original)
+++ httpd/httpd/trunk/server/config.c Fri Aug 20 20:47:35 2010
@@ -1182,7 +1182,7 @@ AP_DECLARE(const char *) ap_build_cont_c
         if (retval != NULL)
             return retval;
 
-        if (sub_tree == NULL && curr_parent != NULL) {
+        if (sub_tree == NULL) {
             sub_tree = *curr_parent;
         }