httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cove...@apache.org
Subject svn commit: r1655146 - in /httpd/httpd/trunk: CHANGES include/http_config.h
Date Tue, 27 Jan 2015 20:21:49 GMT
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 <jzobel heute-morgen.de>, 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 <jzobel heute-morgen.de>, Eric Covener]
+
   *) mod_ssl: 'SSLProtocol ALL' was being ignored in virtual host context. 
      PR 57100.  [Michael Kaufmann <apache-bugzilla michael-kaufmann.ch>,
      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) \



Mime
View raw message