Return-Path: X-Original-To: apmail-httpd-cvs-archive@www.apache.org Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8F221175EE for ; Fri, 30 Jan 2015 21:14:07 +0000 (UTC) Received: (qmail 6777 invoked by uid 500); 30 Jan 2015 21:14:08 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 5888 invoked by uid 500); 30 Jan 2015 21:13:03 -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 3881 invoked by uid 99); 30 Jan 2015 21:11:37 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 30 Jan 2015 21:11:37 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id 445FBAC0024; Fri, 30 Jan 2015 21:11:37 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1656122 - /httpd/httpd/trunk/server/core.c Date: Fri, 30 Jan 2015 21:11:37 -0000 To: cvs@httpd.apache.org From: covener@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150130211137.445FBAC0024@hades.apache.org> Author: covener Date: Fri Jan 30 21:11:36 2015 New Revision: 1656122 URL: http://svn.apache.org/r1656122 Log: correct copy/paste error, use cmd->cmd->name 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=1656122&r1=1656121&r2=1656122&view=diff ============================================================================== --- httpd/httpd/trunk/server/core.c (original) +++ httpd/httpd/trunk/server/core.c Fri Jan 30 21:11:36 2015 @@ -1333,7 +1333,7 @@ static const char *set_define(cmd_parms const char *name, const char *value) { if (cmd->parent && strcasecmp(cmd->parent->directive, "pool, "Define is not valid in ", cmd->parent->directive, " context", NULL); + return apr_pstrcat(cmd->pool, cmd->cmd->name, " is not valid in ", cmd->parent->directive, " context", NULL); } if (ap_strchr_c(name, ':') != NULL) @@ -1360,7 +1360,7 @@ static const char *unset_define(cmd_parm int i; char **defines; if (cmd->parent && strcasecmp(cmd->parent->directive, "pool, "Define is not valid in ", cmd->parent->directive, " context", NULL); + return apr_pstrcat(cmd->pool, cmd->cmd->name, " is not valid in ", cmd->parent->directive, " context", NULL); } if (ap_strchr_c(name, ':') != NULL)