1 files changed, 29 insertions, 1 deletions

diff --git a/src/sp_config_keywords.c b/src/sp_config_keywords.c
index ea4e1cd..fa26635 100644
--- a/src/sp_config_keywords.c
+++ b/src/sp_config_keywords.c
@@ -228,9 +228,32 @@ SP_PARSE_FN(parse_cookie) {
         ZSTR_VAL(samesite), parsed_rule->lineno);
       goto err;
     }
+    zend_string_release(samesite);
+    samesite = NULL;
   }
 
-  SPCFG(cookie).cookies = sp_list_insert(SPCFG(cookie).cookies, cookie);
+  // find other cookie entry with identical name or name_r
+  sp_cookie *entry = NULL;
+  sp_list_node *pList = NULL;
+  for (pList = SPCFG(cookie).cookies; pList; pList = pList->next) {
+    entry = pList->data;
+    if (!entry) { continue; }
+    if ((entry->name && cookie->name && sp_zend_string_equals(entry->name, cookie->name)) ||
+        (entry->name_r && cookie->name_r && sp_zend_string_equals(entry->name_r->pattern, cookie->name_r->pattern))) {
+          break;
+        }
+  }
+  if (pList && entry) {
+    // override cookie settings if set
+    if (cookie->samesite) { entry->samesite = cookie->samesite; }
+    if (cookie->encrypt) { entry->encrypt = cookie->encrypt; }
+    if (cookie->simulation) { entry->simulation = cookie->simulation; }
+    sp_free_cookie(cookie);
+    pefree(cookie, 1);
+    cookie = NULL;
+  } else {
+    SPCFG(cookie).cookies = sp_list_insert(SPCFG(cookie).cookies, cookie);
+  }
 
   return SP_PARSER_STOP;
 
@@ -492,6 +515,11 @@ SP_PARSE_FN(parse_ini_entry) {
     goto err;
   }
 
+  if (zend_hash_find_ptr(SPCFG(ini).entries, entry->key)) {
+    sp_log_err("config", "duplicate INI key '%s' on line %zu", ZSTR_VAL(entry->key), parsed_rule->lineno);
+    goto err;
+  }
+
   if (ro && rw) {
     sp_log_err("config", "rule cannot be both read-write and read-only on line %zu", parsed_rule->lineno);
     goto err;