From e7629ca686c298a6da7f8c69b67273502193c0d9 Mon Sep 17 00:00:00 2001 From: Cliff Woolley Date: Sun, 18 Nov 2001 05:50:43 +0000 Subject: [PATCH] Don't know why these were missing... just an oversight, I'm guessing? git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92026 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 3 +++ include/http_config.h | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/CHANGES b/CHANGES index 5bddc8837a..87259bc9a2 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,8 @@ Changes with Apache 2.0.29-dev + *) Added the missing macros AP_INIT_TAKE13 and AP_INIT_TAKE123. + [Cliff Woolley] + *) Get mod_cgid killed when a MPM exits due to a fatal error. [Jeff Trawick] diff --git a/include/http_config.h b/include/http_config.h index 6da1f9a85c..1329d294c2 100644 --- a/include/http_config.h +++ b/include/http_config.h @@ -166,9 +166,15 @@ typedef union { /** method of declaring a directive which takes multiple 2 arguments */ # define AP_INIT_ITERATE2(directive, func, mconfig, where, help) \ { directive, { .take2=func }, mconfig, where, ITERATE2, help } +/** method of declaring a directive which takes 1 or 3 arguments */ +# define AP_INIT_TAKE13(directive, func, mconfig, where, help) \ + { directive, { .take3=func }, mconfig, where, TAKE13, help } /** method of declaring a directive which takes 2 or 3 arguments */ # define AP_INIT_TAKE23(directive, func, mconfig, where, help) \ { directive, { .take3=func }, mconfig, where, TAKE23, help } +/** method of declaring a directive which takes 1 to 3 arguments */ +# define AP_INIT_TAKE123(directive, func, mconfig, where, help) \ + { directive, { .take3=func }, mconfig, where, TAKE123, help } /** method of declaring a directive which takes 3 arguments */ # define AP_INIT_TAKE3(directive, func, mconfig, where, help) \ { directive, { .take3=func }, mconfig, where, TAKE3, help } @@ -201,8 +207,12 @@ typedef const char *(*cmd_func) (); { directive, func, mconfig, where, TAKE12, help } # define AP_INIT_ITERATE2(directive, func, mconfig, where, help) \ { directive, func, mconfig, where, ITERATE2, help } +# define AP_INIT_TAKE13(directive, func, mconfig, where, help) \ + { directive, func, mconfig, where, TAKE13, help } # define AP_INIT_TAKE23(directive, func, mconfig, where, help) \ { directive, func, mconfig, where, TAKE23, help } +# define AP_INIT_TAKE123(directive, func, mconfig, where, help) \ + { directive, func, mconfig, where, TAKE123, help } # define AP_INIT_TAKE3(directive, func, mconfig, where, help) \ { directive, func, mconfig, where, TAKE3, help } # define AP_INIT_FLAG(directive, func, mconfig, where, help) \ -- 2.50.1