Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 63966 invoked from network); 21 Jan 2011 08:01:36 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 21 Jan 2011 08:01:36 -0000 Received: (qmail 48097 invoked by uid 500); 21 Jan 2011 08:01:35 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 47881 invoked by uid 500); 21 Jan 2011 08:01:33 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 47687 invoked by uid 99); 21 Jan 2011 08:01:32 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 21 Jan 2011 08:01:32 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 21 Jan 2011 08:01:30 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8DC572388A36; Fri, 21 Jan 2011 08:01:09 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1061669 - /httpd/httpd/trunk/server/core.c Date: Fri, 21 Jan 2011 08:01:09 -0000 To: cvs@httpd.apache.org From: rpluem@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110121080109.8DC572388A36@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rpluem Date: Fri Jan 21 08:01:09 2011 New Revision: 1061669 URL: http://svn.apache.org/viewvc?rev=1061669&view=rev Log: * Only unset if we have a table. This can happen if undefine occurs before define. Modified: httpd/httpd/trunk/server/core.c Modified: httpd/httpd/trunk/server/core.c URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/core.c?rev=1061669&r1=1061668&r2=1061669&view=diff ============================================================================== --- httpd/httpd/trunk/server/core.c (original) +++ httpd/httpd/trunk/server/core.c Fri Jan 21 08:01:09 2011 @@ -1243,7 +1243,9 @@ static const char *unset_define(cmd_parm } } - apr_table_unset(server_config_defined_vars, name); + if (server_config_defined_vars) { + apr_table_unset(server_config_defined_vars, name); + } return NULL; }