A better fix for #1273. With this in place the configuration doesn't need a change, but the session counts are 100% accurate.

Author: csutherl

apache2/modsecurity.c

@@ -223,7 +223,13 @@ static void modsecurity_persist_data(modsec_rec *msr) {
 
         /* Only store those collections that changed. */
         if (apr_table_get(msr->collections_dirty, te[i].key)) {
-            collection_store(msr, col);
+            if (msr->txcfg->debuglog_level >= 9) {
+                msc_string *name = (msc_string *)apr_table_get(col, "__name");
+                if (name != NULL) {
+                    msr_log(msr, 9, "Storing dirty collection %s at key %s", name->value, te[i].key);
+                }
+            }
+            collection_store(msr, col, te[i].key);
         }
     }
 

apache2/persist_dbm.c

@@ -324,7 +324,7 @@ apr_table_t *collection_retrieve(modsec_rec *msr, const char *col_name,
 /**
  *
  */
-int collection_store(modsec_rec *msr, apr_table_t *col) {
+int collection_store(modsec_rec *msr, apr_table_t *col, const char *col_name) {
     char *dbm_filename = NULL;
     msc_string *var_name = NULL, *var_key = NULL;
     unsigned char *blob = NULL;
@@ -436,7 +436,7 @@ int collection_store(modsec_rec *msr, apr_table_t *col) {
 
     /* If there is an original value, then create a delta and
      * apply the delta to the current value */
-    orig_col = (const apr_table_t *)apr_table_get(msr->collections_original, var_name->value);
+    orig_col = (const apr_table_t *)apr_table_get(msr->collections_original, col_name);
     if (orig_col != NULL) {
         if (msr->txcfg->debuglog_level >= 9) {
             msr_log(msr, 9, "collection_store: Re-retrieving collection prior to store: %s",

apache2/persist_dbm.h

@@ -21,7 +21,7 @@
 apr_table_t DSOLOCAL *collection_retrieve(modsec_rec *msr, const char *col_name,
     const char *col_value, int col_value_length);
 
-int DSOLOCAL collection_store(modsec_rec *msr, apr_table_t *collection);
+int DSOLOCAL collection_store(modsec_rec *msr, apr_table_t *collection, const char *col_name);
 
 int DSOLOCAL collections_remove_stale(modsec_rec *msr, const char *col_name);