From: Eric Covener Date: Tue, 27 Jan 2015 20:21:48 +0000 (+0000) Subject: AP_INIT_NO_ARGS mishandled in macro X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=08ec6c89f868ab23b81ae9b66c208a70a676de45;p=thirdparty%2Fapache%2Fhttpd.git AP_INIT_NO_ARGS mishandled in macro Submitted by: Joachim Zobel , covener Committed by: covener git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1655146 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/CHANGES b/CHANGES index 2d167f424b1..04bf2b5a768 100644 --- a/CHANGES +++ b/CHANGES @@ -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] diff --git a/include/http_config.h b/include/http_config.h index da3b4a2dace..da4490c0a4b 100644 --- a/include/http_config.h +++ b/include/http_config.h @@ -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) \