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 386AA10BBD for ; Tue, 27 Jan 2015 20:21:49 +0000 (UTC) Received: (qmail 37244 invoked by uid 500); 27 Jan 2015 20:21:49 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 37177 invoked by uid 500); 27 Jan 2015 20:21:49 -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 37167 invoked by uid 99); 27 Jan 2015 20:21:49 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 Jan 2015 20:21:49 +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 6F81BAC019C; Tue, 27 Jan 2015 20:21:49 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1655146 - in /httpd/httpd/trunk: CHANGES include/http_config.h Date: Tue, 27 Jan 2015 20:21:49 -0000 To: cvs@httpd.apache.org From: covener@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150127202149.6F81BAC019C@hades.apache.org> Author: covener Date: Tue Jan 27 20:21:48 2015 New Revision: 1655146 URL: http://svn.apache.org/r1655146 Log: AP_INIT_NO_ARGS mishandled in macro Submitted by: Joachim Zobel , covener Committed by: covener Modified: httpd/httpd/trunk/CHANGES httpd/httpd/trunk/include/http_config.h Modified: httpd/httpd/trunk/CHANGES URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1655146&r1=1655145&r2=1655146&view=diff ============================================================================== --- httpd/httpd/trunk/CHANGES [utf-8] (original) +++ httpd/httpd/trunk/CHANGES [utf-8] Tue Jan 27 20:21:48 2015 @@ -1,6 +1,10 @@ -*- coding: utf-8 -*- Changes with Apache 2.5.0 + *) config: For directives that do not expect any arguments, enforce + that none are specified in the configuration file. + [Joachim Zobel , Eric Covener] + *) mod_ssl: 'SSLProtocol ALL' was being ignored in virtual host context. PR 57100. [Michael Kaufmann , Yann Ylavic] Modified: httpd/httpd/trunk/include/http_config.h URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/http_config.h?rev=1655146&r1=1655145&r2=1655146&view=diff ============================================================================== --- httpd/httpd/trunk/include/http_config.h (original) +++ httpd/httpd/trunk/include/http_config.h Tue Jan 27 20:21:48 2015 @@ -117,7 +117,7 @@ typedef union { /** mechanism for declaring a directive with no arguments */ # define AP_INIT_NO_ARGS(directive, func, mconfig, where, help) \ - { directive, { .no_args=func }, mconfig, where, RAW_ARGS, help } + { directive, { .no_args=func }, mconfig, where, NO_ARGS, help } /** mechanism for declaring a directive with raw argument parsing */ # define AP_INIT_RAW_ARGS(directive, func, mconfig, where, help) \ { directive, { .raw_args=func }, mconfig, where, RAW_ARGS, help } @@ -168,7 +168,7 @@ typedef const char *(*cmd_func) (); # define AP_FLAG func # define AP_INIT_NO_ARGS(directive, func, mconfig, where, help) \ - { directive, func, mconfig, where, RAW_ARGS, help } + { directive, func, mconfig, where, NO_ARGS, help } # define AP_INIT_RAW_ARGS(directive, func, mconfig, where, help) \ { directive, func, mconfig, where, RAW_ARGS, help } # define AP_INIT_TAKE_ARGV(directive, func, mconfig, where, help) \