From: Rainer Jung <rjung@apache.org>
Date: Tue, 26 Jul 2011 15:52:40 +0000 (+0000)
Subject: mod_allowmethods: Correct Merging of "reset" and do
X-Git-Tag: 2.3.14^2~18
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=aa7a7070a4f2a5b9ab6d3a52c1061ac4c730af81;p=thirdparty%2Fapache%2Fhttpd.git

mod_allowmethods: Correct Merging of "reset" and do
not allow an empty parameter list for the
AllowMethods directive.

Furthermore switch from AP_MODULE_DECLARE_DATA
to AP_DECLARE_MODULE (the module was brought in
after the big logging refactoring).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1151143 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index abc98126784..a1dacc287cc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 
 Changes with Apache 2.3.14
 
+  *) mod_allowmethods: Correct Merging of "reset" and do not allow an
+     empty parameter list for the AllowMethods directive. [Rainer Jung]
+
   *) configure: Update selection of modules for 'all' and 'most'. 'all' will
      now enable all modules except for example and test modules. Make the
      selection for 'most' more useful (including ssl and proxy). Both 'all'
diff --git a/modules/aaa/mod_allowmethods.c b/modules/aaa/mod_allowmethods.c
index 4f18410b6e2..4816e29a2a3 100644
--- a/modules/aaa/mod_allowmethods.c
+++ b/modules/aaa/mod_allowmethods.c
@@ -44,6 +44,7 @@
  */
 
 typedef struct am_conf_t {
+  int allowed_set;
   apr_int64_t allowed;
 } am_conf_t;
 
@@ -80,6 +81,7 @@ static void *am_create_conf(apr_pool_t * p, char *dummy)
   am_conf_t *conf = apr_pcalloc(p, sizeof(am_conf_t));
   
   conf->allowed = 0;
+  conf->allowed_set = 0;
   return conf;
 }
 
@@ -88,7 +90,13 @@ static void* am_merge_conf(apr_pool_t* pool, void* a, void* b) {
   am_conf_t* add = (am_conf_t*) b;
   am_conf_t* conf = apr_palloc(pool, sizeof(am_conf_t));
   
-  conf->allowed = add->allowed ? add->allowed : base->allowed;
+  if (add->allowed_set) {
+      conf->allowed = add->allowed;
+      conf->allowed_set = add->allowed_set;
+  } else {
+      conf->allowed = base->allowed;
+      conf->allowed_set = base->allowed_set;
+  }
 
   return conf;
 }
@@ -97,9 +105,13 @@ static const char *am_allowmethods(cmd_parms *cmd, void *d, int argc, char *cons
 {
   int i;
   am_conf_t* conf = (am_conf_t*) d;
+  if (argc == 0) {
+      return "AllowMethods: No method or 'reset' keyword given";
+  }
   if (argc == 1) {
     if (strcasecmp("reset", argv[0]) == 0) {
       conf->allowed = 0;
+      conf->allowed_set = 1;
       return NULL;
     }
   }
@@ -113,6 +125,7 @@ static const char *am_allowmethods(cmd_parms *cmd, void *d, int argc, char *cons
 
     conf->allowed |= (AP_METHOD_BIT << m);
   }
+  conf->allowed_set = 1;
   return NULL;
 }
 
@@ -128,7 +141,7 @@ static const command_rec am_cmds[] = {
   {NULL}
 };
 
-module AP_MODULE_DECLARE_DATA allowmethods_module = {
+AP_DECLARE_MODULE(allowmethods) = {
   STANDARD20_MODULE_STUFF,
   am_create_conf,
   am_merge_conf,