diff --git a/CHANGES b/CHANGES
index 3a75c62c..517e76b7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
 DD mmm YYYY - 2.9.x (to be released)
 -------------------
 
+ * Set the minimum security protocol version for SecRemoteRules
+   [Issue security/code-scanning/2 - @airween]
  * Allow lua version 5.4
    [Issue #2996 - @3eka, @martinhsv]
  * Configure: do not check for pcre1 if pcre2 requested
diff --git a/README.md b/README.md
index d489f846..7223af73 100644
--- a/README.md
+++ b/README.md
@@ -7,12 +7,12 @@ Copyright (c) 2004-2013 Trustwave Holdings, Inc. (http://www.trustwave.com/)
 
 You may not use this file except in compliance with the License. You may obtain a copy of the License at: https://www.apache.org/licenses/LICENSE-2.0
 
-If any of the files related to licensing are missing or if you have any other questions related to licensing please contact Trustwave Holdings, Inc. directly using the email address: security@modsecurity.org.
+If any of the files related to licensing are missing or if you have any other questions related to licensing please contact Trustwave Holdings, Inc. directly using the email address: modsecurity@owasp.org.
 
 
 ## Documentation
 
-Please refer to: [the documentation folder](https://github.com/SpiderLabs/ModSecurity/tree/v2/master/doc) for the reference manual.
+Please refer to: [the documentation folder](https://github.com/owasp-modsecurity/ModSecurity/tree/v2/master/doc) for the reference manual.
 
 ## Sponsor Note
 
diff --git a/apache2/msc_json.c b/apache2/msc_json.c
index 17f938b6..e9d0c99d 100644
--- a/apache2/msc_json.c
+++ b/apache2/msc_json.c
@@ -354,15 +354,17 @@ int json_init(modsec_rec *msr, char **error_msg) {
 int json_process_chunk(modsec_rec *msr, const char *buf, unsigned int size, char **error_msg) {
     if (error_msg == NULL) return -1;
     *error_msg = NULL;
-    base_offset=buf;
+    // Take a copy in case libyajl decodes the buffer inline
+    base_offset = apr_pstrmemdup(msr->mp, buf, size);
+    if (!base_offset) return -1;
 
     /* Feed our parser and catch any errors */
-    msr->json->status = yajl_parse(msr->json->handle, buf, size);
+    msr->json->status = yajl_parse(msr->json->handle, (unsigned char*)base_offset, size);
     if (msr->json->status != yajl_status_ok) {
 	if (msr->json->depth_limit_exceeded) {
            *error_msg = "JSON depth limit exceeded";
 	} else {
-           char *yajl_err = yajl_get_error(msr->json->handle, 0, buf, size);
+           char *yajl_err = yajl_get_error(msr->json->handle, 0, base_offset, size);
            *error_msg = apr_pstrdup(msr->mp, yajl_err);
            yajl_free_error(msr->json->handle, yajl_err);
 	}
diff --git a/apache2/msc_logging.c b/apache2/msc_logging.c
index 7f286500..cdd116f8 100644
--- a/apache2/msc_logging.c
+++ b/apache2/msc_logging.c
@@ -234,15 +234,7 @@ static char *construct_auditlog_filename(apr_pool_t *mp, const char *uniqueid) {
      * This is required for mpm-itk & mod_ruid2, though should be harmless for other implementations 
      * It also changes the return statement.
      */
-    char *userinfo;
-    apr_status_t rc;
-    apr_uid_t uid;
-    apr_gid_t gid;
-    apr_uid_current(&uid, &gid, mp);
-    rc = apr_uid_name_get(&userinfo, uid, mp);
-    if (rc != APR_SUCCESS) {
-      userinfo = apr_psprintf(mp, "%u", uid);
-    }
+    char *userinfo = get_username(mp);
 
     apr_time_exp_lt(&t, apr_time_now());
 
diff --git a/apache2/msc_pcre.c b/apache2/msc_pcre.c
index 6f1a9a18..86bb1601 100644
--- a/apache2/msc_pcre.c
+++ b/apache2/msc_pcre.c
@@ -31,11 +31,7 @@ static apr_status_t msc_pcre_cleanup(msc_regex_t *regex) {
         }
 #else
         if (regex->pe != NULL) {
-#if defined(VERSION_NGINX)
             pcre_free(regex->pe);
-#else
-            free(regex->pe);
-#endif
             regex->pe = NULL;
         }
         if (regex->re != NULL) {
@@ -152,19 +148,15 @@ void *msc_pregcomp_ex(apr_pool_t *pool, const char *pattern, int options,
 
     #ifdef WITH_PCRE_STUDY
         #ifdef WITH_PCRE_JIT
-                pe = pcre_study(regex->re, PCRE_STUDY_JIT_COMPILE, &errptr);
+                pe = pcre_study(regex->re, PCRE_STUDY_EXTRA_NEEDED|PCRE_STUDY_JIT_COMPILE, &errptr);
         #else
-                pe = pcre_study(regex->re, 0, &errptr);
+                pe = pcre_study(regex->re, PCRE_STUDY_EXTRA_NEEDED, &errptr);
         #endif
     #endif
 
     /* Setup the pcre_extra record if pcre_study did not already do it */
     if (pe == NULL) {
-#if defined(VERSION_NGINX)
-        pe = pcre_malloc(sizeof(pcre_extra));
-#else
-        pe = malloc(sizeof(pcre_extra));
-#endif
+        pe = (pcre_extra*)pcre_malloc(sizeof(pcre_extra));
         if (pe == NULL) {
             return NULL;
         }
diff --git a/apache2/msc_remote_rules.c b/apache2/msc_remote_rules.c
index 99968f04..37b88648 100644
--- a/apache2/msc_remote_rules.c
+++ b/apache2/msc_remote_rules.c
@@ -331,8 +331,8 @@ int msc_remote_download_content(apr_pool_t *mp, const char *uri, const char *key
             headers_chunk = curl_slist_append(headers_chunk, header_key);
         }
 
-        /* Make it TLS 1.x only. */
-        curl_easy_setopt(curl, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1);
+        /* Make it TLS 1.2 at least. */
+        curl_easy_setopt(curl, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1_2);
 
 #ifdef WIN32
         res_len = SearchPathA(NULL, "curl-ca-bundle.crt", NULL, (2048 + 1), buf, &ptr);
diff --git a/apache2/msc_util.c b/apache2/msc_util.c
index cf9a3935..0ce58f91 100644
--- a/apache2/msc_util.c
+++ b/apache2/msc_util.c
@@ -2843,3 +2843,14 @@ char* strtok_r(
 }
 #endif
 
+// Function compatible with Linux & Windows, also with mpm-itk & mod_ruid2
+char* get_username(apr_pool_t* mp) {
+  	char* username;
+  	apr_uid_t uid;
+  	apr_gid_t gid;
+  	int rc = apr_uid_current(&uid, &gid, mp);
+  	if (rc != APR_SUCCESS) return "apache";
+   rc = apr_uid_name_get(&username, uid, mp);
+   if (rc != APR_SUCCESS) return "apache";
+   return username;
+}
diff --git a/apache2/msc_util.h b/apache2/msc_util.h
index f7e1280f..e4e043de 100644
--- a/apache2/msc_util.h
+++ b/apache2/msc_util.h
@@ -159,6 +159,8 @@ int DSOLOCAL tree_contains_ip(apr_pool_t *mp, TreeRoot *rtree,
 int DSOLOCAL ip_tree_from_param(apr_pool_t *pool,
     char *param, TreeRoot **rtree, char **error_msg);
 
+char DSOLOCAL *get_username(apr_pool_t* mp);
+
 #ifdef WITH_CURL
 int ip_tree_from_uri(TreeRoot **rtree, char *uri,
     apr_pool_t *mp, char **error_msg);
diff --git a/apache2/persist_dbm.c b/apache2/persist_dbm.c
index e4f8036f..edd41c11 100644
--- a/apache2/persist_dbm.c
+++ b/apache2/persist_dbm.c
@@ -1,841 +1,808 @@
-/*
-* ModSecurity for Apache 2.x, http://www.modsecurity.org/
-* Copyright (c) 2004-2013 Trustwave Holdings, Inc. (http://www.trustwave.com/)
-*
-* You may not use this file except in compliance with
-* the License.  You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* If any of the files related to licensing are missing or if you have any
-* other questions related to licensing please contact Trustwave Holdings, Inc.
-* directly using the email address security@modsecurity.org.
-*/
-
-#include "persist_dbm.h"
-#include "apr_sdbm.h"
-
-/**
- *
- */
-static apr_table_t *collection_unpack(modsec_rec *msr, const unsigned char *blob, unsigned int blob_size,
-    int log_vars)
-{
-    apr_table_t *col = NULL;
-    unsigned int blob_offset;
-
-    col = apr_table_make(msr->mp, 32);
-    if (col == NULL) return NULL;
-
-    /* ENH verify the first 3 bytes (header) */
-
-    blob_offset = 3;
-    while (blob_offset + 1 < blob_size) {
-        msc_string *var = apr_pcalloc(msr->mp, sizeof(msc_string));
-
-        var->name_len = (blob[blob_offset] << 8) + blob[blob_offset + 1];
-        if (var->name_len == 0) {
-            /* Is the length a name length, or just the end of the blob? */
-            if (blob_offset < blob_size - 2) {
-                /* This should never happen as the name length
-                 * includes the terminating NUL and should be 1 for ""
-                 */
-                if (msr->txcfg->debuglog_level >= 9) {
-                    msr_log(msr, 9, "collection_unpack: BLOB[%d]: %s", blob_offset, log_escape_hex(msr->mp, blob + blob_offset, blob_size - blob_offset));
-                }
-                msr_log(msr, 4, "collection_unpack: Possibly corrupted database: var name length = 0 at blob offset %u-%u.", blob_offset, blob_offset + 1);
-            }
-            break;
-        }
-        else if (var->name_len > 65536) {
-            /* This should never happen as the length is restricted on store
-             * to 65536.
-             */
-            if (msr->txcfg->debuglog_level >= 9) {
-                msr_log(msr, 9, "collection_unpack: BLOB[%d]: %s", blob_offset, log_escape_hex(msr->mp, blob + blob_offset, blob_size - blob_offset));
-            }
-            msr_log(msr, 4, "collection_unpack: Possibly corrupted database: var name length > 65536 (0x%04x) at blob offset %u-%u.", var->name_len, blob_offset, blob_offset + 1);
-            break;
-        }
-
-        blob_offset += 2;
-        if (blob_offset + var->name_len > blob_size) return NULL;
-        var->name = apr_pstrmemdup(msr->mp, (const char *)blob + blob_offset, var->name_len - 1);
-        blob_offset += var->name_len;
-        var->name_len--;
-
-        var->value_len = (blob[blob_offset] << 8) + blob[blob_offset + 1];
-        blob_offset += 2;
-
-        if (blob_offset + var->value_len > blob_size) return NULL;
-        var->value = apr_pstrmemdup(msr->mp, (const char *)blob + blob_offset, var->value_len - 1);
-        blob_offset += var->value_len;
-        var->value_len--;
-
-        if (log_vars && (msr->txcfg->debuglog_level >= 9)) {
-            msr_log(msr, 9, "collection_unpack: Read variable: name \"%s\", value \"%s\".",
-                log_escape_ex(msr->mp, var->name, var->name_len),
-                log_escape_ex(msr->mp, var->value, var->value_len));
-        }
-
-        apr_table_addn(col, var->name, (void *)var);
-    }
-
-    return col;
-}
-
-/**
- *
- */
-static apr_table_t *collection_retrieve_ex(apr_sdbm_t *existing_dbm, modsec_rec *msr, const char *col_name,
-    const char *col_key, int col_key_len)
-{
-    char *dbm_filename = NULL;
-    apr_status_t rc;
-    apr_sdbm_datum_t key;
-    apr_sdbm_datum_t *value = NULL;
-    apr_sdbm_t *dbm = NULL;
-    apr_table_t *col = NULL;
-    const apr_array_header_t *arr;
-    apr_table_entry_t *te;
-    int expired = 0;
-    int i;
-
-    /**
-     * This is required for mpm-itk & mod_ruid2, though should be harmless for other implementations 
-     */
-    char *userinfo;
-    apr_uid_t uid;
-    apr_gid_t gid;
-    apr_uid_current(&uid, &gid, msr->mp);
-    rc = apr_uid_name_get(&userinfo, uid, msr->mp);
-    if (rc != APR_SUCCESS) {
-      userinfo = apr_psprintf(msr->mp, "%u", uid);
-    }
-
-    if (msr->txcfg->data_dir == NULL) {
-        msr_log(msr, 1, "collection_retrieve_ex: Unable to retrieve collection (name \"%s\", key \"%s\"). Use "
-            "SecDataDir to define data directory first.", log_escape(msr->mp, col_name),
-            log_escape_ex(msr->mp, col_key, col_key_len));
-        goto cleanup;
-    }
-
-    dbm_filename = apr_pstrcat(msr->mp, msr->txcfg->data_dir, "/", userinfo, "-", col_name, NULL);
-
-    if (msr->txcfg->debuglog_level >= 9) {
-        msr_log(msr, 9, "collection_retrieve_ex: collection_retrieve_ex: Retrieving collection (name \"%s\", filename \"%s\")",log_escape(msr->mp, col_name),
-                log_escape(msr->mp, dbm_filename));
-    }
-
-    key.dptr = (char *)col_key;
-    key.dsize = col_key_len + 1;
-
-    if (existing_dbm == NULL) {
-#ifdef GLOBAL_COLLECTION_LOCK
-        rc = apr_global_mutex_lock(msr->modsecurity->dbm_lock);
-        if (rc != APR_SUCCESS) {
-            msr_log(msr, 1, "collection_retrieve_ex: Failed to lock proc mutex: %s",
-                    get_apr_error(msr->mp, rc));
-            goto cleanup;
-        }
-#endif
-        rc = apr_sdbm_open(&dbm, dbm_filename, APR_READ | APR_SHARELOCK,
-            CREATEMODE, msr->mp);
-        if (rc != APR_SUCCESS) {
-            dbm = NULL;
-#ifdef GLOBAL_COLLECTION_LOCK
-            apr_global_mutex_unlock(msr->modsecurity->dbm_lock);
-#endif
-            goto cleanup;
-        }
-    }
-    else {
-        dbm = existing_dbm;
-    }
-
-    value = (apr_sdbm_datum_t *)apr_pcalloc(msr->mp, sizeof(apr_sdbm_datum_t));
-    rc = apr_sdbm_fetch(dbm, value, key);
-    if (rc != APR_SUCCESS) {
-        msr_log(msr, 1, "collection_retrieve_ex: Failed to read from DBM file \"%s\": %s", log_escape(msr->mp,
-            dbm_filename), get_apr_error(msr->mp, rc));
-        goto cleanup;
-    }
-
-    if (value->dptr == NULL) { /* Key not found in DBM file. */
-        goto cleanup;
-    }
-
-    /* ENH Need expiration (and perhaps other metadata) accessible in blob
-     * form to determine if converting to a table is needed.  This will
-     * save some cycles.
-     */
-
-    /* Transform raw data into a table. */
-    col = collection_unpack(msr, (const unsigned char *)value->dptr, value->dsize, 1);
-    if (col == NULL) {
-        goto cleanup;
-    }
-
-    /* Close after "value" used from fetch or memory may be overwritten. */
-    if (existing_dbm == NULL) {
-        apr_sdbm_close(dbm);
-#ifdef GLOBAL_COLLECTION_LOCK
-        apr_global_mutex_unlock(msr->modsecurity->dbm_lock);
-#endif
-        dbm = NULL;
-    }
-
-    /* Remove expired variables. */
-    do {
-        arr = apr_table_elts(col);
-        te = (apr_table_entry_t *)arr->elts;
-        for (i = 0; i < arr->nelts; i++) {
-            if (strncmp(te[i].key, "__expire_", 9) == 0) {
-                msc_string *var = (msc_string *)te[i].val;
-                int expiry_time = atoi(var->value);
-
-                if (expiry_time <= apr_time_sec(msr->request_time)) {
-                    char *key_to_expire = te[i].key;
-
-                    /* Done early if the col expired */
-                    if (strcmp(key_to_expire, "__expire_KEY") == 0) {
-                        expired = 1;
-                    }
-                    
-                    if (msr->txcfg->debuglog_level >= 9) {
-                        msr_log(msr, 9, "collection_retrieve_ex: Removing key \"%s\" from collection.", key_to_expire + 9);
-                        msr_log(msr, 9, "collection_retrieve_ex: Removing key \"%s\" from collection.", key_to_expire);
-                    }
-                    
-                    apr_table_unset(col, key_to_expire + 9);
-                    apr_table_unset(col, key_to_expire);
-                    
-                    if (msr->txcfg->debuglog_level >= 4) {
-                        msr_log(msr, 4, "collection_retrieve_ex: Removed expired variable \"%s\".", key_to_expire + 9);
-                    }
-                    
-                    break;
-                }
-            }
-        }
-    } while(!expired && (i != arr->nelts));
-
-    /* Delete the collection if the variable "KEY" does not exist.
-     *
-     * ENH It would probably be more efficient to hold the DBM
-     * open until determined if it needs deleted than to open a second
-     * time.
-     */
-    if (apr_table_get(col, "KEY") == NULL) {
-        if (existing_dbm == NULL) {
-#ifdef GLOBAL_COLLECTION_LOCK
-            rc = apr_global_mutex_lock(msr->modsecurity->dbm_lock);
-            if (rc != APR_SUCCESS) {
-                msr_log(msr, 1, "collection_retrieve_ex: Failed to lock proc mutex: %s",
-                        get_apr_error(msr->mp, rc));
-                goto cleanup;
-            }
-#endif
-            rc = apr_sdbm_open(&dbm, dbm_filename, APR_CREATE | APR_WRITE | APR_SHARELOCK,
-                CREATEMODE, msr->mp);
-            if (rc != APR_SUCCESS) {
-                msr_log(msr, 1, "collection_retrieve_ex: Failed to access DBM file \"%s\": %s",
-                    log_escape(msr->mp, dbm_filename), get_apr_error(msr->mp, rc));
-                dbm = NULL;
-#ifdef GLOBAL_COLLECTION_LOCK
-                apr_global_mutex_unlock(msr->modsecurity->dbm_lock);
-#endif
-                goto cleanup;
-            }
-        }
-        else {
-            dbm = existing_dbm;
-        }
-
-        rc = apr_sdbm_delete(dbm, key);
-        if (rc != APR_SUCCESS) {
-#ifdef LOG_NO_COLL_DELET_PB
-		if (msr->txcfg->debuglog_level >= 9)
-#endif
-		msr_log(msr, 1, "collection_retrieve_ex: Failed deleting collection (name \"%s\", "
-			"key \"%s\"): %s", log_escape(msr->mp, col_name),
-			log_escape_ex(msr->mp, col_key, col_key_len), get_apr_error(msr->mp, rc));
-		msr->msc_sdbm_delete_error = 1;
-            goto cleanup;
-        }
-
-
-        if (existing_dbm == NULL) {
-            apr_sdbm_close(dbm);
-#ifdef GLOBAL_COLLECTION_LOCK
-            apr_global_mutex_unlock(msr->modsecurity->dbm_lock);
-#endif
-            dbm = NULL;
-        }
-
-        if (expired && (msr->txcfg->debuglog_level >= 9)) {
-            msr_log(msr, 9, "collection_retrieve_ex: Collection expired (name \"%s\", key \"%s\").", col_name,
-                log_escape_ex(msr->mp, col_key, col_key_len));
-        }
-        if (msr->txcfg->debuglog_level >= 4) {
-            msr_log(msr, 4, "collection_retrieve_ex: Deleted collection (name \"%s\", key \"%s\").",
-                log_escape(msr->mp, col_name), log_escape_ex(msr->mp, col_key, col_key_len));
-        }
-        goto cleanup;
-    }
-
-    /* Update UPDATE_RATE */
-    {
-        msc_string *var;
-        int create_time, counter;
-
-        var = (msc_string *)apr_table_get(col, "CREATE_TIME");
-        if (var == NULL) {
-            /* Error. */
-        } else {
-            create_time = atoi(var->value);
-            var = (msc_string *)apr_table_get(col, "UPDATE_COUNTER");
-            if (var == NULL) {
-                /* Error. */
-            } else {
-                apr_time_t td;
-                counter = atoi(var->value);
-
-                /* UPDATE_RATE is removed on store, so add it back here */
-                var = (msc_string *)apr_pcalloc(msr->mp, sizeof(msc_string));
-                var->name = "UPDATE_RATE";
-                var->name_len = strlen(var->name);
-                apr_table_setn(col, var->name, (void *)var);
-
-                /* NOTE: No rate if there has been no time elapsed */
-                td = (apr_time_sec(apr_time_now()) - create_time);
-                if (td == 0) {
-                    var->value = apr_psprintf(msr->mp, "%d", 0);
-                }
-                else {
-                    var->value = apr_psprintf(msr->mp, "%" APR_TIME_T_FMT,
-                        (apr_time_t)((60 * counter)/td));
-                }
-                var->value_len = strlen(var->value);
-            }
-        }
-    }
-
-    if (msr->txcfg->debuglog_level >= 4) {
-        msr_log(msr, 4, "collection_retrieve_ex: Retrieved collection (name \"%s\", key \"%s\").",
-            log_escape(msr->mp, col_name), log_escape_ex(msr->mp, col_key, col_key_len));
-    }
-
-    if ((existing_dbm == NULL) && dbm) {
-        /* Should not ever get here */
-        msr_log(msr, 1, "collection_retrieve_ex: Internal Error: Collection remained open (name \"%s\", key \"%s\").",
-            log_escape(msr->mp, col_name), log_escape_ex(msr->mp, col_key, col_key_len));
-
-        apr_sdbm_close(dbm);
-#ifdef GLOBAL_COLLECTION_LOCK
-        apr_global_mutex_unlock(msr->modsecurity->dbm_lock);
-#endif
-    }
-
-    return col;
-
-cleanup:
-
-    if ((existing_dbm == NULL) && dbm) {
-        apr_sdbm_close(dbm);
-#ifdef GLOBAL_COLLECTION_LOCK
-        apr_global_mutex_unlock(msr->modsecurity->dbm_lock);
-#endif
-    }
-
-    return NULL;
-}
-
-/**
- *
- */
-apr_table_t *collection_retrieve(modsec_rec *msr, const char *col_name,
-    const char *col_key, int col_key_len)
-{
-    apr_time_t time_before = apr_time_now();
-    apr_table_t *rtable = NULL;
-    
-    rtable = collection_retrieve_ex(NULL, msr, col_name, col_key, col_key_len);
-    
-    msr->time_storage_read += apr_time_now() - time_before;
-    
-    return rtable;
-}
-
-/**
- *
- */
-int collection_store(modsec_rec *msr, apr_table_t *col) {
-    char *dbm_filename = NULL;
-    msc_string *var_name = NULL, *var_key = NULL;
-    unsigned char *blob = NULL;
-    unsigned int blob_size, blob_offset;
-    apr_status_t rc;
-    apr_sdbm_datum_t key;
-    apr_sdbm_datum_t value;
-    apr_sdbm_t *dbm = NULL;
-    const apr_array_header_t *arr;
-    apr_table_entry_t *te;
-    int i;
-    const apr_table_t *stored_col = NULL;
-    const apr_table_t *orig_col = NULL;
-
-    /**
-     * This is required for mpm-itk & mod_ruid2, though should be harmless for other implementations 
-     */
-    char *userinfo;
-    apr_uid_t uid;
-    apr_gid_t gid;
-    apr_uid_current(&uid, &gid, msr->mp);
-    rc = apr_uid_name_get(&userinfo, uid, msr->mp);
-    if (rc != APR_SUCCESS) {
-      userinfo = apr_psprintf(msr->mp, "%u", uid);
-    }
-
-    var_name = (msc_string *)apr_table_get(col, "__name");
-    if (var_name == NULL) {
-        goto error;
-    }
-
-    var_key = (msc_string *)apr_table_get(col, "__key");
-    if (var_key == NULL) {
-        goto error;
-    }
-
-    if (msr->txcfg->data_dir == NULL) {
-        msr_log(msr, 1, "collection_store: Unable to store collection (name \"%s\", key \"%s\"). Use "
-            "SecDataDir to define data directory first.", log_escape_ex(msr->mp, var_name->value, var_name->value_len),
-            log_escape_ex(msr->mp, var_key->value, var_key->value_len));
-        goto error;
-    }
-
-    // ENH: lowercase the var name in the filename
-    dbm_filename = apr_pstrcat(msr->mp, msr->txcfg->data_dir, "/", userinfo, "-", var_name->value, NULL);
-
-    if (msr->txcfg->debuglog_level >= 9) {
-        msr_log(msr, 9, "collection_store: Retrieving collection (name \"%s\", filename \"%s\")",log_escape(msr->mp, var_name->value),
-                log_escape(msr->mp, dbm_filename));
-    }
-
-#ifdef GLOBAL_COLLECTION_LOCK
-    /* Need to lock to pull in the stored data again and apply deltas. */
-    rc = apr_global_mutex_lock(msr->modsecurity->dbm_lock);
-    if (rc != APR_SUCCESS) {
-        msr_log(msr, 1, "collection_store: Failed to lock proc mutex: %s",
-                get_apr_error(msr->mp, rc));
-        goto error;
-    }
-#endif
-
-    /* Delete IS_NEW on store. */
-    apr_table_unset(col, "IS_NEW");
-
-    /* Delete UPDATE_RATE on store to save space as it is calculated */
-    apr_table_unset(col, "UPDATE_RATE");
-
-    /* Update the timeout value. */
-    {
-        msc_string *var = (msc_string *)apr_table_get(col, "TIMEOUT");
-        if (var != NULL) {
-            int timeout = atoi(var->value);
-            var = (msc_string *)apr_table_get(col, "__expire_KEY");
-            if (var != NULL) {
-                var->value = apr_psprintf(msr->mp, "%" APR_TIME_T_FMT, (apr_time_t)(apr_time_sec(apr_time_now()) + timeout));
-                var->value_len = strlen(var->value);
-            }
-        }
-    }
-
-    /* LAST_UPDATE_TIME */
-    {
-        msc_string *var = (msc_string *)apr_table_get(col, "LAST_UPDATE_TIME");
-        if (var == NULL) {
-            var = (msc_string *)apr_pcalloc(msr->mp, sizeof(msc_string));
-            var->name = "LAST_UPDATE_TIME";
-            var->name_len = strlen(var->name);
-            apr_table_setn(col, var->name, (void *)var);
-        }
-        var->value = apr_psprintf(msr->mp, "%" APR_TIME_T_FMT, (apr_time_t)(apr_time_sec(apr_time_now())));
-        var->value_len = strlen(var->value);
-    }
-
-    /* UPDATE_COUNTER */
-    {
-        msc_string *var = (msc_string *)apr_table_get(col, "UPDATE_COUNTER");
-        int counter = 0;
-        if (var == NULL) {
-            var = (msc_string *)apr_pcalloc(msr->mp, sizeof(msc_string));
-            var->name = "UPDATE_COUNTER";
-            var->name_len = strlen(var->name);
-            apr_table_setn(col, var->name, (void *)var);
-        } else {
-            counter = atoi(var->value);
-        }
-        var->value = apr_psprintf(msr->mp, "%d", counter + 1);
-        var->value_len = strlen(var->value);
-    }
-
-    /* ENH Make the expiration timestamp accessible in blob form so that
-     * it is easier/faster to determine expiration without having to
-     * convert back to table form
-     */
-
-    rc = apr_sdbm_open(&dbm, dbm_filename, APR_CREATE | APR_WRITE | APR_SHARELOCK,
-        CREATEMODE, msr->mp);
-    if (rc != APR_SUCCESS) {
-#ifdef GLOBAL_COLLECTION_LOCK
-        apr_global_mutex_unlock(msr->modsecurity->dbm_lock);
-#endif
-        msr_log(msr, 1, "collection_store: Failed to access DBM file \"%s\": %s", log_escape(msr->mp, dbm_filename),
-            get_apr_error(msr->mp, rc));
-        dbm = NULL;
-        goto error;
-    }
-
-#ifndef GLOBAL_COLLECTION_LOCK
-    /* Need to lock to pull in the stored data again and apply deltas. */
-    rc = apr_sdbm_lock(dbm, APR_FLOCK_EXCLUSIVE);
-    if (rc != APR_SUCCESS) {
-        msr_log(msr, 1, "collection_store: Failed to exclusivly lock DBM file \"%s\": %s", log_escape(msr->mp, dbm_filename),
-            get_apr_error(msr->mp, rc));
-        goto error;
-    }
-#endif
-
-    /* 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);
-    if (orig_col != NULL) {
-        if (msr->txcfg->debuglog_level >= 9) {
-            msr_log(msr, 9, "collection_store: Re-retrieving collection prior to store: %s",
-                apr_psprintf(msr->mp, "%.*s", var_name->value_len, var_name->value));
-        }
-
-        stored_col = (const apr_table_t *)collection_retrieve_ex(dbm, msr, var_name->value, var_key->value, var_key->value_len);
-    }
-
-    /* Merge deltas and calculate the size first. */
-    blob_size = 3 + 2;
-    arr = apr_table_elts(col);
-    te = (apr_table_entry_t *)arr->elts;
-    for (i = 0; i < arr->nelts; i++) {
-        msc_string *var = (msc_string *)te[i].val;
-        int len;
-
-        /* If there is an original value, then apply the delta
-         * to the latest stored value */
-        if (stored_col != NULL) {
-            const msc_string *orig_var = (const msc_string *)apr_table_get(orig_col, var->name);
-            if (orig_var != NULL) {
-                const msc_string *stored_var = (const msc_string *)apr_table_get(stored_col, var->name);
-                if (stored_var != NULL) {
-                    int origval = atoi(orig_var->value);
-                    int ourval = atoi(var->value);
-                    int storedval = atoi(stored_var->value);
-                    int delta = ourval - origval;
-                    int newval = storedval + delta;
-
-                    if (newval < 0) newval = 0; /* Counters never go below zero. */
-
-                    var->value = apr_psprintf(msr->mp, "%d", newval);
-                    var->value_len = strlen(var->value);
-
-                    if (msr->txcfg->debuglog_level >= 9) {
-                        msr_log(msr, 9, "collection_store: Delta applied for %s.%s %d->%d (%d): %d + (%d) = %d [%s,%d]",
-                        log_escape_ex(msr->mp, var_name->value, var_name->value_len),
-                        log_escape_ex(msr->mp, var->name, var->name_len),
-                        origval, ourval, delta, storedval, delta, newval, var->value, var->value_len);
-                    }
-                }
-            }
-        }
-
-        // Allocate blob_size for keys
-        len = var->name_len + 1;
-        if (len >= 65536) len = 65536;
-        blob_size += len + 2;
-
-        // Allocate blob_size for values
-        len = var->value_len + 1;
-        if (len >= 65536) len = 65536;
-        blob_size += len + 2;
-    }
-
-    /* Now generate the binary object. */
-    blob = apr_pcalloc(msr->mp, blob_size);
-    if (blob == NULL) {
-        if (dbm != NULL) {
-#ifdef GLOBAL_COLLECTION_LOCK
-            apr_sdbm_close(dbm);
-            apr_global_mutex_unlock(msr->modsecurity->dbm_lock);
-#else
-            apr_sdbm_unlock(dbm);
-            apr_sdbm_close(dbm);
-#endif
-        }
-
-        return -1;
-    }
-
-    blob[0] = 0x49;
-    blob[1] = 0x52;
-    blob[2] = 0x01;
-
-    blob_offset = 3;
-    arr = apr_table_elts(col);
-    te = (apr_table_entry_t *)arr->elts;
-    for (i = 0; i < arr->nelts; i++) {
-        msc_string *var = (msc_string *)te[i].val;
-        int len;
-
-        len = var->name_len + 1;
-        if (len >= 65536) len = 65536;
-
-        blob[blob_offset + 0] = (len & 0xff00) >> 8;
-        blob[blob_offset + 1] = len & 0x00ff;
-        memcpy(blob + blob_offset + 2, var->name, len - 1);
-        blob[blob_offset + 2 + len - 1] = '\0';
-        blob_offset += 2 + len;
-
-        len = var->value_len + 1;
-        if (len >= 65536) len = 65536;
-
-        blob[blob_offset + 0] = (len & 0xff00) >> 8;
-        blob[blob_offset + 1] = len & 0x00ff;
-        memcpy(blob + blob_offset + 2, var->value, len - 1);
-        blob[blob_offset + 2 + len - 1] = '\0';
-        blob_offset += 2 + len;
-
-        if (msr->txcfg->debuglog_level >= 9) {
-            msr_log(msr, 9, "collection_store: Wrote variable: name \"%s\", value \"%s\".",
-                log_escape_ex(msr->mp, var->name, var->name_len),
-                log_escape_ex(msr->mp, var->value, var->value_len));
-        }
-    }
-
-    blob[blob_offset] = 0;
-    blob[blob_offset + 1] = 0;
-
-    /* And, finally, store it. */
-    key.dptr = var_key->value;
-    key.dsize = var_key->value_len + 1;
-
-    value.dptr = (char *)blob;
-    value.dsize = blob_size;
-
-    rc = apr_sdbm_store(dbm, key, value, APR_SDBM_REPLACE);
-    if (rc != APR_SUCCESS) {
-        msr_log(msr, 1, "collection_store: Failed to write to DBM file \"%s\": %s", dbm_filename,
-                get_apr_error(msr->mp, rc));
-        if (dbm != NULL) {
-#ifdef GLOBAL_COLLECTION_LOCK
-            apr_sdbm_close(dbm);
-            apr_global_mutex_unlock(msr->modsecurity->dbm_lock);
-#else
-            apr_sdbm_unlock(dbm);
-            apr_sdbm_close(dbm);
-#endif
-        }
-
-        return -1;
-    }
-
-#ifdef GLOBAL_COLLECTION_LOCK
-    apr_sdbm_close(dbm);
-    apr_global_mutex_unlock(msr->modsecurity->dbm_lock);
-#else
-    apr_sdbm_unlock(dbm);
-    apr_sdbm_close(dbm);
-#endif
-
-    if (msr->txcfg->debuglog_level >= 4) {
-        msr_log(msr, 4, "collection_store: Persisted collection (name \"%s\", key \"%s\").",
-            log_escape_ex(msr->mp, var_name->value, var_name->value_len),
-            log_escape_ex(msr->mp, var_key->value, var_key->value_len));
-    }
-
-    return 0;
-
-error:
-    return -1;
-}
-
-/**
- *
- */
-int collections_remove_stale(modsec_rec *msr, const char *col_name) {
-    char *dbm_filename = NULL;
-    apr_sdbm_datum_t key, value;
-    apr_sdbm_t *dbm = NULL;
-    apr_status_t rc;
-    apr_array_header_t *keys_arr;
-    char **keys;
-    apr_time_t now = apr_time_sec(msr->request_time);
-    int i;
-
-    /**
-     * This is required for mpm-itk & mod_ruid2, though should be harmless for other implementations 
-     */
-    char *userinfo;
-    apr_uid_t uid;
-    apr_gid_t gid;
-    apr_uid_current(&uid, &gid, msr->mp);
-    rc = apr_uid_name_get(&userinfo, uid, msr->mp);
-    if (rc != APR_SUCCESS) {
-      userinfo = apr_psprintf(msr->mp, "%u", uid);
-    }
-
-    if (msr->txcfg->data_dir == NULL) {
-        /* The user has been warned about this problem enough times already by now.
-         * msr_log(msr, 1, "Unable to access collection file (name \"%s\"). Use SecDataDir to "
-         *     "define data directory first.", log_escape(msr->mp, col_name));
-         */
-        goto error;
-    }
-
-    if(strstr(col_name,"USER") || strstr(col_name,"SESSION") || strstr(col_name, "RESOURCE"))
-        dbm_filename = apr_pstrcat(msr->mp, msr->txcfg->data_dir, "/", userinfo, "-", msr->txcfg->webappid, "_", col_name, NULL);
-    else
-        dbm_filename = apr_pstrcat(msr->mp, msr->txcfg->data_dir, "/", userinfo, "-", col_name, NULL);
-
-    if (msr->txcfg->debuglog_level >= 9) {
-        msr_log(msr, 9, "collections_remove_stale: Retrieving collection (name \"%s\", filename \"%s\")",log_escape(msr->mp, col_name),
-                log_escape(msr->mp, dbm_filename));
-    }
-
-#ifdef GLOBAL_COLLECTION_LOCK
-    rc = apr_global_mutex_lock(msr->modsecurity->dbm_lock);
-    if (rc != APR_SUCCESS) {
-        msr_log(msr, 1, "collections_remove_stale: Failed to lock proc mutex: %s",
-                get_apr_error(msr->mp, rc));
-        goto error;
-    }
-#endif
-
-    rc = apr_sdbm_open(&dbm, dbm_filename, APR_CREATE | APR_WRITE | APR_SHARELOCK,
-            CREATEMODE, msr->mp);
-    if (rc != APR_SUCCESS) {
-#ifdef GLOBAL_COLLECTION_LOCK
-        apr_global_mutex_unlock(msr->modsecurity->dbm_lock);
-#endif
-        msr_log(msr, 1, "collections_remove_stale: Failed to access DBM file \"%s\": %s", log_escape(msr->mp, dbm_filename),
-                get_apr_error(msr->mp, rc));
-        dbm = NULL;
-        goto error;
-    }
-
-    /* First get a list of all keys. */
-    keys_arr = apr_array_make(msr->mp, 256, sizeof(char *));
-
-#ifndef GLOBAL_COLLECTION_LOCK
-    rc = apr_sdbm_lock(dbm, APR_FLOCK_SHARED);
-    if (rc != APR_SUCCESS) {
-        msr_log(msr, 1, "collections_remove_stale: Failed to lock DBM file \"%s\": %s", log_escape(msr->mp, dbm_filename),
-            get_apr_error(msr->mp, rc));
-        goto error;
-    }
-#endif
-
-    /* No one can write to the file while doing this so
-     * do it as fast as possible.
-     */
-    rc = apr_sdbm_firstkey(dbm, &key);
-    while(rc == APR_SUCCESS) {
-        if (key.dsize) {
-            char *s = apr_pstrmemdup(msr->mp, key.dptr, key.dsize - 1);
-            *(char **)apr_array_push(keys_arr) = s;
-        }
-        rc = apr_sdbm_nextkey(dbm, &key);
-    }
-#ifndef GLOBAL_COLLECTION_LOCK
-    apr_sdbm_unlock(dbm);
-#endif
-
-    if (msr->txcfg->debuglog_level >= 9) {
-        msr_log(msr, 9, "collections_remove_stale: Found %d record(s) in file \"%s\".", keys_arr->nelts,
-            log_escape(msr->mp, dbm_filename));
-    }
-
-    /* Now retrieve the entires one by one. */
-    keys = (char **)keys_arr->elts;
-    for (i = 0; i < keys_arr->nelts; i++) {
-        key.dptr = keys[i];
-        key.dsize = strlen(key.dptr) + 1;
-
-        rc = apr_sdbm_fetch(dbm, &value, key);
-        if (rc != APR_SUCCESS) {
-            msr_log(msr, 1, "collections_remove_stale: Failed reading DBM file \"%s\": %s",
-                log_escape(msr->mp, dbm_filename), get_apr_error(msr->mp, rc));
-            goto error;
-        }
-
-        if (value.dptr != NULL) {
-            apr_table_t *col = NULL;
-            msc_string *var = NULL;
-
-            col = collection_unpack(msr, (const unsigned char *)value.dptr, value.dsize, 0);
-            if (col == NULL) {
-                goto error;
-            }
-
-            var = (msc_string *)apr_table_get(col, "__expire_KEY");
-            if (var == NULL) {
-                msr_log(msr, 1, "collections_remove_stale: Collection cleanup discovered entry with no "
-                    "__expire_KEY (name \"%s\", key \"%s\").",
-                    log_escape(msr->mp, col_name), log_escape_ex(msr->mp, key.dptr, key.dsize - 1));
-            } else {
-                unsigned int expiry_time = atoi(var->value);
-
-                if (msr->txcfg->debuglog_level >= 9) {
-                    msr_log(msr, 9, "collections_remove_stale: Record (name \"%s\", key \"%s\") set to expire in %" APR_TIME_T_FMT " seconds.",
-                        log_escape(msr->mp, col_name), log_escape_ex(msr->mp, key.dptr, key.dsize - 1),
-                        expiry_time - now);
-                }
-
-                if (expiry_time <= now) {
-                    rc = apr_sdbm_delete(dbm, key);
-                    if (rc != APR_SUCCESS) {
-#ifdef LOG_NO_COLL_DELET_PB
-			if (msr->txcfg->debuglog_level >= 9)
-#endif
-			msr_log(msr, 1, "collections_remove_stale: Failed deleting collection (name \"%s\", "
-                            "key \"%s\"): %s", log_escape(msr->mp, col_name),
-                            log_escape_ex(msr->mp, key.dptr, key.dsize - 1), get_apr_error(msr->mp, rc));
-			msr->msc_sdbm_delete_error = 1;
-                        goto error;
-                    }
-
-                    if (msr->txcfg->debuglog_level >= 4) {
-                        msr_log(msr, 4, "collections_remove_stale: Removed stale collection (name \"%s\", "
-                            "key \"%s\").", log_escape(msr->mp, col_name),
-                            log_escape_ex(msr->mp, key.dptr, key.dsize - 1));
-                    }
-                }
-            }
-        } else {
-            /* Ignore entry not found - it may have been removed in the meantime. */
-        }
-    }
-
-    apr_sdbm_close(dbm);
-#ifdef GLOBAL_COLLECTION_LOCK
-    apr_global_mutex_unlock(msr->modsecurity->dbm_lock);
-#endif
-    return 1;
-
-error:
-
-    if (dbm) {
-        apr_sdbm_close(dbm);
-#ifdef GLOBAL_COLLECTION_LOCK
-        apr_global_mutex_unlock(msr->modsecurity->dbm_lock);
-#endif
-    }
-
-    return -1;
-}
+/*
+* ModSecurity for Apache 2.x, http://www.modsecurity.org/
+* Copyright (c) 2004-2013 Trustwave Holdings, Inc. (http://www.trustwave.com/)
+*
+* You may not use this file except in compliance with
+* the License.  You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* If any of the files related to licensing are missing or if you have any
+* other questions related to licensing please contact Trustwave Holdings, Inc.
+* directly using the email address security@modsecurity.org.
+*/
+
+#include "persist_dbm.h"
+#include "apr_sdbm.h"
+
+/**
+ *
+ */
+static apr_table_t *collection_unpack(modsec_rec *msr, const unsigned char *blob, unsigned int blob_size,
+    int log_vars)
+{
+    apr_table_t *col = NULL;
+    unsigned int blob_offset;
+
+    col = apr_table_make(msr->mp, 32);
+    if (col == NULL) return NULL;
+
+    /* ENH verify the first 3 bytes (header) */
+
+    blob_offset = 3;
+    while (blob_offset + 1 < blob_size) {
+        msc_string *var = apr_pcalloc(msr->mp, sizeof(msc_string));
+
+        var->name_len = (blob[blob_offset] << 8) + blob[blob_offset + 1];
+        if (var->name_len == 0) {
+            /* Is the length a name length, or just the end of the blob? */
+            if (blob_offset < blob_size - 2) {
+                /* This should never happen as the name length
+                 * includes the terminating NUL and should be 1 for ""
+                 */
+                if (msr->txcfg->debuglog_level >= 9) {
+                    msr_log(msr, 9, "collection_unpack: BLOB[%d]: %s", blob_offset, log_escape_hex(msr->mp, blob + blob_offset, blob_size - blob_offset));
+                }
+                msr_log(msr, 4, "collection_unpack: Possibly corrupted database: var name length = 0 at blob offset %u-%u.", blob_offset, blob_offset + 1);
+            }
+            break;
+        }
+        else if (var->name_len > 65536) {
+            /* This should never happen as the length is restricted on store
+             * to 65536.
+             */
+            if (msr->txcfg->debuglog_level >= 9) {
+                msr_log(msr, 9, "collection_unpack: BLOB[%d]: %s", blob_offset, log_escape_hex(msr->mp, blob + blob_offset, blob_size - blob_offset));
+            }
+            msr_log(msr, 4, "collection_unpack: Possibly corrupted database: var name length > 65536 (0x%04x) at blob offset %u-%u.", var->name_len, blob_offset, blob_offset + 1);
+            break;
+        }
+
+        blob_offset += 2;
+        if (blob_offset + var->name_len > blob_size) return NULL;
+        var->name = apr_pstrmemdup(msr->mp, (const char *)blob + blob_offset, var->name_len - 1);
+        blob_offset += var->name_len;
+        var->name_len--;
+
+        var->value_len = (blob[blob_offset] << 8) + blob[blob_offset + 1];
+        blob_offset += 2;
+
+        if (blob_offset + var->value_len > blob_size) return NULL;
+        var->value = apr_pstrmemdup(msr->mp, (const char *)blob + blob_offset, var->value_len - 1);
+        blob_offset += var->value_len;
+        var->value_len--;
+
+        if (log_vars && (msr->txcfg->debuglog_level >= 9)) {
+            msr_log(msr, 9, "collection_unpack: Read variable: name \"%s\", value \"%s\".",
+                log_escape_ex(msr->mp, var->name, var->name_len),
+                log_escape_ex(msr->mp, var->value, var->value_len));
+        }
+
+        apr_table_addn(col, var->name, (void *)var);
+    }
+
+    return col;
+}
+
+/**
+ *
+ */
+static apr_table_t *collection_retrieve_ex(apr_sdbm_t *existing_dbm, modsec_rec *msr, const char *col_name,
+    const char *col_key, int col_key_len)
+{
+    char *dbm_filename = NULL;
+    apr_status_t rc;
+    apr_sdbm_datum_t key;
+    apr_sdbm_datum_t *value = NULL;
+    apr_sdbm_t *dbm = NULL;
+    apr_table_t *col = NULL;
+    const apr_array_header_t *arr;
+    apr_table_entry_t *te;
+    int expired = 0;
+    int i;
+    char *userinfo = get_username(msr->mp);
+
+    if (msr->txcfg->data_dir == NULL) {
+        msr_log(msr, 1, "collection_retrieve_ex: Unable to retrieve collection (name \"%s\", key \"%s\"). Use "
+            "SecDataDir to define data directory first.", log_escape(msr->mp, col_name),
+            log_escape_ex(msr->mp, col_key, col_key_len));
+        goto cleanup;
+    }
+
+    dbm_filename = apr_pstrcat(msr->mp, msr->txcfg->data_dir, "/", userinfo, "-", col_name, NULL);
+
+    if (msr->txcfg->debuglog_level >= 9) {
+        msr_log(msr, 9, "collection_retrieve_ex: collection_retrieve_ex: Retrieving collection (name \"%s\", filename \"%s\")",log_escape(msr->mp, col_name),
+                log_escape(msr->mp, dbm_filename));
+    }
+
+    key.dptr = (char *)col_key;
+    key.dsize = col_key_len + 1;
+
+    if (existing_dbm == NULL) {
+#ifdef GLOBAL_COLLECTION_LOCK
+        rc = apr_global_mutex_lock(msr->modsecurity->dbm_lock);
+        if (rc != APR_SUCCESS) {
+            msr_log(msr, 1, "collection_retrieve_ex: Failed to lock proc mutex: %s",
+                    get_apr_error(msr->mp, rc));
+            goto cleanup;
+        }
+#endif
+        rc = apr_sdbm_open(&dbm, dbm_filename, APR_READ | APR_SHARELOCK,
+            CREATEMODE, msr->mp);
+        if (rc != APR_SUCCESS) {
+            dbm = NULL;
+#ifdef GLOBAL_COLLECTION_LOCK
+            apr_global_mutex_unlock(msr->modsecurity->dbm_lock);
+#endif
+            goto cleanup;
+        }
+    }
+    else {
+        dbm = existing_dbm;
+    }
+
+    value = (apr_sdbm_datum_t *)apr_pcalloc(msr->mp, sizeof(apr_sdbm_datum_t));
+    rc = apr_sdbm_fetch(dbm, value, key);
+    if (rc != APR_SUCCESS) {
+        msr_log(msr, 1, "collection_retrieve_ex: Failed to read from DBM file \"%s\": %s", log_escape(msr->mp,
+            dbm_filename), get_apr_error(msr->mp, rc));
+        goto cleanup;
+    }
+
+    if (value->dptr == NULL) { /* Key not found in DBM file. */
+        goto cleanup;
+    }
+
+    /* ENH Need expiration (and perhaps other metadata) accessible in blob
+     * form to determine if converting to a table is needed.  This will
+     * save some cycles.
+     */
+
+    /* Transform raw data into a table. */
+    col = collection_unpack(msr, (const unsigned char *)value->dptr, value->dsize, 1);
+    if (col == NULL) {
+        goto cleanup;
+    }
+
+    /* Close after "value" used from fetch or memory may be overwritten. */
+    if (existing_dbm == NULL) {
+        apr_sdbm_close(dbm);
+#ifdef GLOBAL_COLLECTION_LOCK
+        apr_global_mutex_unlock(msr->modsecurity->dbm_lock);
+#endif
+        dbm = NULL;
+    }
+
+    /* Remove expired variables. */
+    do {
+        arr = apr_table_elts(col);
+        te = (apr_table_entry_t *)arr->elts;
+        for (i = 0; i < arr->nelts; i++) {
+            if (strncmp(te[i].key, "__expire_", 9) == 0) {
+                msc_string *var = (msc_string *)te[i].val;
+                int expiry_time = atoi(var->value);
+
+                if (expiry_time <= apr_time_sec(msr->request_time)) {
+                    char *key_to_expire = te[i].key;
+
+                    /* Done early if the col expired */
+                    if (strcmp(key_to_expire, "__expire_KEY") == 0) {
+                        expired = 1;
+                    }
+                    
+                    if (msr->txcfg->debuglog_level >= 9) {
+                        msr_log(msr, 9, "collection_retrieve_ex: Removing key \"%s\" from collection.", key_to_expire + 9);
+                        msr_log(msr, 9, "collection_retrieve_ex: Removing key \"%s\" from collection.", key_to_expire);
+                    }
+                    
+                    apr_table_unset(col, key_to_expire + 9);
+                    apr_table_unset(col, key_to_expire);
+                    
+                    if (msr->txcfg->debuglog_level >= 4) {
+                        msr_log(msr, 4, "collection_retrieve_ex: Removed expired variable \"%s\".", key_to_expire + 9);
+                    }
+                    
+                    break;
+                }
+            }
+        }
+    } while(!expired && (i != arr->nelts));
+
+    /* Delete the collection if the variable "KEY" does not exist.
+     *
+     * ENH It would probably be more efficient to hold the DBM
+     * open until determined if it needs deleted than to open a second
+     * time.
+     */
+    if (apr_table_get(col, "KEY") == NULL) {
+        if (existing_dbm == NULL) {
+#ifdef GLOBAL_COLLECTION_LOCK
+            rc = apr_global_mutex_lock(msr->modsecurity->dbm_lock);
+            if (rc != APR_SUCCESS) {
+                msr_log(msr, 1, "collection_retrieve_ex: Failed to lock proc mutex: %s",
+                        get_apr_error(msr->mp, rc));
+                goto cleanup;
+            }
+#endif
+            rc = apr_sdbm_open(&dbm, dbm_filename, APR_CREATE | APR_WRITE | APR_SHARELOCK,
+                CREATEMODE, msr->mp);
+            if (rc != APR_SUCCESS) {
+                msr_log(msr, 1, "collection_retrieve_ex: Failed to access DBM file \"%s\": %s",
+                    log_escape(msr->mp, dbm_filename), get_apr_error(msr->mp, rc));
+                dbm = NULL;
+#ifdef GLOBAL_COLLECTION_LOCK
+                apr_global_mutex_unlock(msr->modsecurity->dbm_lock);
+#endif
+                goto cleanup;
+            }
+        }
+        else {
+            dbm = existing_dbm;
+        }
+
+        rc = apr_sdbm_delete(dbm, key);
+        if (rc != APR_SUCCESS) {
+#ifdef LOG_NO_COLL_DELET_PB
+		if (msr->txcfg->debuglog_level >= 9)
+#endif
+		msr_log(msr, 1, "collection_retrieve_ex: Failed deleting collection (name \"%s\", "
+			"key \"%s\"): %s", log_escape(msr->mp, col_name),
+			log_escape_ex(msr->mp, col_key, col_key_len), get_apr_error(msr->mp, rc));
+		msr->msc_sdbm_delete_error = 1;
+            goto cleanup;
+        }
+
+
+        if (existing_dbm == NULL) {
+            apr_sdbm_close(dbm);
+#ifdef GLOBAL_COLLECTION_LOCK
+            apr_global_mutex_unlock(msr->modsecurity->dbm_lock);
+#endif
+            dbm = NULL;
+        }
+
+        if (expired && (msr->txcfg->debuglog_level >= 9)) {
+            msr_log(msr, 9, "collection_retrieve_ex: Collection expired (name \"%s\", key \"%s\").", col_name,
+                log_escape_ex(msr->mp, col_key, col_key_len));
+        }
+        if (msr->txcfg->debuglog_level >= 4) {
+            msr_log(msr, 4, "collection_retrieve_ex: Deleted collection (name \"%s\", key \"%s\").",
+                log_escape(msr->mp, col_name), log_escape_ex(msr->mp, col_key, col_key_len));
+        }
+        goto cleanup;
+    }
+
+    /* Update UPDATE_RATE */
+    {
+        msc_string *var;
+        int create_time, counter;
+
+        var = (msc_string *)apr_table_get(col, "CREATE_TIME");
+        if (var == NULL) {
+            /* Error. */
+        } else {
+            create_time = atoi(var->value);
+            var = (msc_string *)apr_table_get(col, "UPDATE_COUNTER");
+            if (var == NULL) {
+                /* Error. */
+            } else {
+                apr_time_t td;
+                counter = atoi(var->value);
+
+                /* UPDATE_RATE is removed on store, so add it back here */
+                var = (msc_string *)apr_pcalloc(msr->mp, sizeof(msc_string));
+                var->name = "UPDATE_RATE";
+                var->name_len = strlen(var->name);
+                apr_table_setn(col, var->name, (void *)var);
+
+                /* NOTE: No rate if there has been no time elapsed */
+                td = (apr_time_sec(apr_time_now()) - create_time);
+                if (td == 0) {
+                    var->value = apr_psprintf(msr->mp, "%d", 0);
+                }
+                else {
+                    var->value = apr_psprintf(msr->mp, "%" APR_TIME_T_FMT,
+                        (apr_time_t)((60 * counter)/td));
+                }
+                var->value_len = strlen(var->value);
+            }
+        }
+    }
+
+    if (msr->txcfg->debuglog_level >= 4) {
+        msr_log(msr, 4, "collection_retrieve_ex: Retrieved collection (name \"%s\", key \"%s\").",
+            log_escape(msr->mp, col_name), log_escape_ex(msr->mp, col_key, col_key_len));
+    }
+
+    if ((existing_dbm == NULL) && dbm) {
+        /* Should not ever get here */
+        msr_log(msr, 1, "collection_retrieve_ex: Internal Error: Collection remained open (name \"%s\", key \"%s\").",
+            log_escape(msr->mp, col_name), log_escape_ex(msr->mp, col_key, col_key_len));
+
+        apr_sdbm_close(dbm);
+#ifdef GLOBAL_COLLECTION_LOCK
+        apr_global_mutex_unlock(msr->modsecurity->dbm_lock);
+#endif
+    }
+
+    return col;
+
+cleanup:
+
+    if ((existing_dbm == NULL) && dbm) {
+        apr_sdbm_close(dbm);
+#ifdef GLOBAL_COLLECTION_LOCK
+        apr_global_mutex_unlock(msr->modsecurity->dbm_lock);
+#endif
+    }
+
+    return NULL;
+}
+
+/**
+ *
+ */
+apr_table_t *collection_retrieve(modsec_rec *msr, const char *col_name,
+    const char *col_key, int col_key_len)
+{
+    apr_time_t time_before = apr_time_now();
+    apr_table_t *rtable = NULL;
+    
+    rtable = collection_retrieve_ex(NULL, msr, col_name, col_key, col_key_len);
+    
+    msr->time_storage_read += apr_time_now() - time_before;
+    
+    return rtable;
+}
+
+/**
+ *
+ */
+int collection_store(modsec_rec *msr, apr_table_t *col) {
+    char *dbm_filename = NULL;
+    msc_string *var_name = NULL, *var_key = NULL;
+    unsigned char *blob = NULL;
+    unsigned int blob_size, blob_offset;
+    apr_status_t rc;
+    apr_sdbm_datum_t key;
+    apr_sdbm_datum_t value;
+    apr_sdbm_t *dbm = NULL;
+    const apr_array_header_t *arr;
+    apr_table_entry_t *te;
+    int i;
+    const apr_table_t *stored_col = NULL;
+    const apr_table_t *orig_col = NULL;
+    char *userinfo = get_username(msr->mp);
+
+    var_name = (msc_string *)apr_table_get(col, "__name");
+    if (var_name == NULL) {
+        goto error;
+    }
+
+    var_key = (msc_string *)apr_table_get(col, "__key");
+    if (var_key == NULL) {
+        goto error;
+    }
+
+    if (msr->txcfg->data_dir == NULL) {
+        msr_log(msr, 1, "collection_store: Unable to store collection (name \"%s\", key \"%s\"). Use "
+            "SecDataDir to define data directory first.", log_escape_ex(msr->mp, var_name->value, var_name->value_len),
+            log_escape_ex(msr->mp, var_key->value, var_key->value_len));
+        goto error;
+    }
+
+    // ENH: lowercase the var name in the filename
+    dbm_filename = apr_pstrcat(msr->mp, msr->txcfg->data_dir, "/", userinfo, "-", var_name->value, NULL);
+
+    if (msr->txcfg->debuglog_level >= 9) {
+        msr_log(msr, 9, "collection_store: Retrieving collection (name \"%s\", filename \"%s\")",log_escape(msr->mp, var_name->value),
+                log_escape(msr->mp, dbm_filename));
+    }
+
+#ifdef GLOBAL_COLLECTION_LOCK
+    /* Need to lock to pull in the stored data again and apply deltas. */
+    rc = apr_global_mutex_lock(msr->modsecurity->dbm_lock);
+    if (rc != APR_SUCCESS) {
+        msr_log(msr, 1, "collection_store: Failed to lock proc mutex: %s",
+                get_apr_error(msr->mp, rc));
+        goto error;
+    }
+#endif
+
+    /* Delete IS_NEW on store. */
+    apr_table_unset(col, "IS_NEW");
+
+    /* Delete UPDATE_RATE on store to save space as it is calculated */
+    apr_table_unset(col, "UPDATE_RATE");
+
+    /* Update the timeout value. */
+    {
+        msc_string *var = (msc_string *)apr_table_get(col, "TIMEOUT");
+        if (var != NULL) {
+            int timeout = atoi(var->value);
+            var = (msc_string *)apr_table_get(col, "__expire_KEY");
+            if (var != NULL) {
+                var->value = apr_psprintf(msr->mp, "%" APR_TIME_T_FMT, (apr_time_t)(apr_time_sec(apr_time_now()) + timeout));
+                var->value_len = strlen(var->value);
+            }
+        }
+    }
+
+    /* LAST_UPDATE_TIME */
+    {
+        msc_string *var = (msc_string *)apr_table_get(col, "LAST_UPDATE_TIME");
+        if (var == NULL) {
+            var = (msc_string *)apr_pcalloc(msr->mp, sizeof(msc_string));
+            var->name = "LAST_UPDATE_TIME";
+            var->name_len = strlen(var->name);
+            apr_table_setn(col, var->name, (void *)var);
+        }
+        var->value = apr_psprintf(msr->mp, "%" APR_TIME_T_FMT, (apr_time_t)(apr_time_sec(apr_time_now())));
+        var->value_len = strlen(var->value);
+    }
+
+    /* UPDATE_COUNTER */
+    {
+        msc_string *var = (msc_string *)apr_table_get(col, "UPDATE_COUNTER");
+        int counter = 0;
+        if (var == NULL) {
+            var = (msc_string *)apr_pcalloc(msr->mp, sizeof(msc_string));
+            var->name = "UPDATE_COUNTER";
+            var->name_len = strlen(var->name);
+            apr_table_setn(col, var->name, (void *)var);
+        } else {
+            counter = atoi(var->value);
+        }
+        var->value = apr_psprintf(msr->mp, "%d", counter + 1);
+        var->value_len = strlen(var->value);
+    }
+
+    /* ENH Make the expiration timestamp accessible in blob form so that
+     * it is easier/faster to determine expiration without having to
+     * convert back to table form
+     */
+
+    rc = apr_sdbm_open(&dbm, dbm_filename, APR_CREATE | APR_WRITE | APR_SHARELOCK,
+        CREATEMODE, msr->mp);
+    if (rc != APR_SUCCESS) {
+#ifdef GLOBAL_COLLECTION_LOCK
+        apr_global_mutex_unlock(msr->modsecurity->dbm_lock);
+#endif
+        msr_log(msr, 1, "collection_store: Failed to access DBM file \"%s\": %s", log_escape(msr->mp, dbm_filename),
+            get_apr_error(msr->mp, rc));
+        dbm = NULL;
+        goto error;
+    }
+
+#ifndef GLOBAL_COLLECTION_LOCK
+    /* Need to lock to pull in the stored data again and apply deltas. */
+    rc = apr_sdbm_lock(dbm, APR_FLOCK_EXCLUSIVE);
+    if (rc != APR_SUCCESS) {
+        msr_log(msr, 1, "collection_store: Failed to exclusivly lock DBM file \"%s\": %s", log_escape(msr->mp, dbm_filename),
+            get_apr_error(msr->mp, rc));
+        goto error;
+    }
+#endif
+
+    /* 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);
+    if (orig_col != NULL) {
+        if (msr->txcfg->debuglog_level >= 9) {
+            msr_log(msr, 9, "collection_store: Re-retrieving collection prior to store: %s",
+                apr_psprintf(msr->mp, "%.*s", var_name->value_len, var_name->value));
+        }
+
+        stored_col = (const apr_table_t *)collection_retrieve_ex(dbm, msr, var_name->value, var_key->value, var_key->value_len);
+    }
+
+    /* Merge deltas and calculate the size first. */
+    blob_size = 3 + 2;
+    arr = apr_table_elts(col);
+    te = (apr_table_entry_t *)arr->elts;
+    for (i = 0; i < arr->nelts; i++) {
+        msc_string *var = (msc_string *)te[i].val;
+        int len;
+
+        /* If there is an original value, then apply the delta
+         * to the latest stored value */
+        if (stored_col != NULL) {
+            const msc_string *orig_var = (const msc_string *)apr_table_get(orig_col, var->name);
+            if (orig_var != NULL) {
+                const msc_string *stored_var = (const msc_string *)apr_table_get(stored_col, var->name);
+                if (stored_var != NULL) {
+                    int origval = atoi(orig_var->value);
+                    int ourval = atoi(var->value);
+                    int storedval = atoi(stored_var->value);
+                    int delta = ourval - origval;
+                    int newval = storedval + delta;
+
+                    if (newval < 0) newval = 0; /* Counters never go below zero. */
+
+                    var->value = apr_psprintf(msr->mp, "%d", newval);
+                    var->value_len = strlen(var->value);
+
+                    if (msr->txcfg->debuglog_level >= 9) {
+                        msr_log(msr, 9, "collection_store: Delta applied for %s.%s %d->%d (%d): %d + (%d) = %d [%s,%d]",
+                        log_escape_ex(msr->mp, var_name->value, var_name->value_len),
+                        log_escape_ex(msr->mp, var->name, var->name_len),
+                        origval, ourval, delta, storedval, delta, newval, var->value, var->value_len);
+                    }
+                }
+            }
+        }
+
+        // Allocate blob_size for keys
+        len = var->name_len + 1;
+        if (len >= 65536) len = 65536;
+        blob_size += len + 2;
+
+        // Allocate blob_size for values
+        len = var->value_len + 1;
+        if (len >= 65536) len = 65536;
+        blob_size += len + 2;
+    }
+
+    /* Now generate the binary object. */
+    blob = apr_pcalloc(msr->mp, blob_size);
+    if (blob == NULL) {
+        if (dbm != NULL) {
+#ifdef GLOBAL_COLLECTION_LOCK
+            apr_sdbm_close(dbm);
+            apr_global_mutex_unlock(msr->modsecurity->dbm_lock);
+#else
+            apr_sdbm_unlock(dbm);
+            apr_sdbm_close(dbm);
+#endif
+        }
+
+        return -1;
+    }
+
+    blob[0] = 0x49;
+    blob[1] = 0x52;
+    blob[2] = 0x01;
+
+    blob_offset = 3;
+    arr = apr_table_elts(col);
+    te = (apr_table_entry_t *)arr->elts;
+    for (i = 0; i < arr->nelts; i++) {
+        msc_string *var = (msc_string *)te[i].val;
+        int len;
+
+        len = var->name_len + 1;
+        if (len >= 65536) len = 65536;
+
+        blob[blob_offset + 0] = (len & 0xff00) >> 8;
+        blob[blob_offset + 1] = len & 0x00ff;
+        memcpy(blob + blob_offset + 2, var->name, len - 1);
+        blob[blob_offset + 2 + len - 1] = '\0';
+        blob_offset += 2 + len;
+
+        len = var->value_len + 1;
+        if (len >= 65536) len = 65536;
+
+        blob[blob_offset + 0] = (len & 0xff00) >> 8;
+        blob[blob_offset + 1] = len & 0x00ff;
+        memcpy(blob + blob_offset + 2, var->value, len - 1);
+        blob[blob_offset + 2 + len - 1] = '\0';
+        blob_offset += 2 + len;
+
+        if (msr->txcfg->debuglog_level >= 9) {
+            msr_log(msr, 9, "collection_store: Wrote variable: name \"%s\", value \"%s\".",
+                log_escape_ex(msr->mp, var->name, var->name_len),
+                log_escape_ex(msr->mp, var->value, var->value_len));
+        }
+    }
+
+    blob[blob_offset] = 0;
+    blob[blob_offset + 1] = 0;
+
+    /* And, finally, store it. */
+    key.dptr = var_key->value;
+    key.dsize = var_key->value_len + 1;
+
+    value.dptr = (char *)blob;
+    value.dsize = blob_size;
+
+    rc = apr_sdbm_store(dbm, key, value, APR_SDBM_REPLACE);
+    if (rc != APR_SUCCESS) {
+        msr_log(msr, 1, "collection_store: Failed to write to DBM file \"%s\": %s", dbm_filename,
+                get_apr_error(msr->mp, rc));
+        if (dbm != NULL) {
+#ifdef GLOBAL_COLLECTION_LOCK
+            apr_sdbm_close(dbm);
+            apr_global_mutex_unlock(msr->modsecurity->dbm_lock);
+#else
+            apr_sdbm_unlock(dbm);
+            apr_sdbm_close(dbm);
+#endif
+        }
+
+        return -1;
+    }
+
+#ifdef GLOBAL_COLLECTION_LOCK
+    apr_sdbm_close(dbm);
+    apr_global_mutex_unlock(msr->modsecurity->dbm_lock);
+#else
+    apr_sdbm_unlock(dbm);
+    apr_sdbm_close(dbm);
+#endif
+
+    if (msr->txcfg->debuglog_level >= 4) {
+        msr_log(msr, 4, "collection_store: Persisted collection (name \"%s\", key \"%s\").",
+            log_escape_ex(msr->mp, var_name->value, var_name->value_len),
+            log_escape_ex(msr->mp, var_key->value, var_key->value_len));
+    }
+
+    return 0;
+
+error:
+    return -1;
+}
+
+/**
+ *
+ */
+int collections_remove_stale(modsec_rec *msr, const char *col_name) {
+    char *dbm_filename = NULL;
+    apr_sdbm_datum_t key, value;
+    apr_sdbm_t *dbm = NULL;
+    apr_status_t rc;
+    apr_array_header_t *keys_arr;
+    char **keys;
+    apr_time_t now = apr_time_sec(msr->request_time);
+    int i;
+    char *userinfo = get_username(msr->mp);
+
+    if (msr->txcfg->data_dir == NULL) {
+        /* The user has been warned about this problem enough times already by now.
+         * msr_log(msr, 1, "Unable to access collection file (name \"%s\"). Use SecDataDir to "
+         *     "define data directory first.", log_escape(msr->mp, col_name));
+         */
+        goto error;
+    }
+
+    if(strstr(col_name,"USER") || strstr(col_name,"SESSION") || strstr(col_name, "RESOURCE"))
+        dbm_filename = apr_pstrcat(msr->mp, msr->txcfg->data_dir, "/", userinfo, "-", msr->txcfg->webappid, "_", col_name, NULL);
+    else
+        dbm_filename = apr_pstrcat(msr->mp, msr->txcfg->data_dir, "/", userinfo, "-", col_name, NULL);
+
+    if (msr->txcfg->debuglog_level >= 9) {
+        msr_log(msr, 9, "collections_remove_stale: Retrieving collection (name \"%s\", filename \"%s\")",log_escape(msr->mp, col_name),
+                log_escape(msr->mp, dbm_filename));
+    }
+
+#ifdef GLOBAL_COLLECTION_LOCK
+    rc = apr_global_mutex_lock(msr->modsecurity->dbm_lock);
+    if (rc != APR_SUCCESS) {
+        msr_log(msr, 1, "collections_remove_stale: Failed to lock proc mutex: %s",
+                get_apr_error(msr->mp, rc));
+        goto error;
+    }
+#endif
+
+    rc = apr_sdbm_open(&dbm, dbm_filename, APR_CREATE | APR_WRITE | APR_SHARELOCK,
+            CREATEMODE, msr->mp);
+    if (rc != APR_SUCCESS) {
+#ifdef GLOBAL_COLLECTION_LOCK
+        apr_global_mutex_unlock(msr->modsecurity->dbm_lock);
+#endif
+        msr_log(msr, 1, "collections_remove_stale: Failed to access DBM file \"%s\": %s", log_escape(msr->mp, dbm_filename),
+                get_apr_error(msr->mp, rc));
+        dbm = NULL;
+        goto error;
+    }
+
+    /* First get a list of all keys. */
+    keys_arr = apr_array_make(msr->mp, 256, sizeof(char *));
+
+#ifndef GLOBAL_COLLECTION_LOCK
+    rc = apr_sdbm_lock(dbm, APR_FLOCK_SHARED);
+    if (rc != APR_SUCCESS) {
+        msr_log(msr, 1, "collections_remove_stale: Failed to lock DBM file \"%s\": %s", log_escape(msr->mp, dbm_filename),
+            get_apr_error(msr->mp, rc));
+        goto error;
+    }
+#endif
+
+    /* No one can write to the file while doing this so
+     * do it as fast as possible.
+     */
+    rc = apr_sdbm_firstkey(dbm, &key);
+    while(rc == APR_SUCCESS) {
+        if (key.dsize) {
+            char *s = apr_pstrmemdup(msr->mp, key.dptr, key.dsize - 1);
+            *(char **)apr_array_push(keys_arr) = s;
+        }
+        rc = apr_sdbm_nextkey(dbm, &key);
+    }
+#ifndef GLOBAL_COLLECTION_LOCK
+    apr_sdbm_unlock(dbm);
+#endif
+
+    if (msr->txcfg->debuglog_level >= 9) {
+        msr_log(msr, 9, "collections_remove_stale: Found %d record(s) in file \"%s\".", keys_arr->nelts,
+            log_escape(msr->mp, dbm_filename));
+    }
+
+    /* Now retrieve the entires one by one. */
+    keys = (char **)keys_arr->elts;
+    for (i = 0; i < keys_arr->nelts; i++) {
+        key.dptr = keys[i];
+        key.dsize = strlen(key.dptr) + 1;
+
+        rc = apr_sdbm_fetch(dbm, &value, key);
+        if (rc != APR_SUCCESS) {
+            msr_log(msr, 1, "collections_remove_stale: Failed reading DBM file \"%s\": %s",
+                log_escape(msr->mp, dbm_filename), get_apr_error(msr->mp, rc));
+            goto error;
+        }
+
+        if (value.dptr != NULL) {
+            apr_table_t *col = NULL;
+            msc_string *var = NULL;
+
+            col = collection_unpack(msr, (const unsigned char *)value.dptr, value.dsize, 0);
+            if (col == NULL) {
+                goto error;
+            }
+
+            var = (msc_string *)apr_table_get(col, "__expire_KEY");
+            if (var == NULL) {
+                msr_log(msr, 1, "collections_remove_stale: Collection cleanup discovered entry with no "
+                    "__expire_KEY (name \"%s\", key \"%s\").",
+                    log_escape(msr->mp, col_name), log_escape_ex(msr->mp, key.dptr, key.dsize - 1));
+            } else {
+                unsigned int expiry_time = atoi(var->value);
+
+                if (msr->txcfg->debuglog_level >= 9) {
+                    msr_log(msr, 9, "collections_remove_stale: Record (name \"%s\", key \"%s\") set to expire in %" APR_TIME_T_FMT " seconds.",
+                        log_escape(msr->mp, col_name), log_escape_ex(msr->mp, key.dptr, key.dsize - 1),
+                        expiry_time - now);
+                }
+
+                if (expiry_time <= now) {
+                    rc = apr_sdbm_delete(dbm, key);
+                    if (rc != APR_SUCCESS) {
+#ifdef LOG_NO_COLL_DELET_PB
+			if (msr->txcfg->debuglog_level >= 9)
+#endif
+			msr_log(msr, 1, "collections_remove_stale: Failed deleting collection (name \"%s\", "
+                            "key \"%s\"): %s", log_escape(msr->mp, col_name),
+                            log_escape_ex(msr->mp, key.dptr, key.dsize - 1), get_apr_error(msr->mp, rc));
+			msr->msc_sdbm_delete_error = 1;
+                        goto error;
+                    }
+
+                    if (msr->txcfg->debuglog_level >= 4) {
+                        msr_log(msr, 4, "collections_remove_stale: Removed stale collection (name \"%s\", "
+                            "key \"%s\").", log_escape(msr->mp, col_name),
+                            log_escape_ex(msr->mp, key.dptr, key.dsize - 1));
+                    }
+                }
+            }
+        } else {
+            /* Ignore entry not found - it may have been removed in the meantime. */
+        }
+    }
+
+    apr_sdbm_close(dbm);
+#ifdef GLOBAL_COLLECTION_LOCK
+    apr_global_mutex_unlock(msr->modsecurity->dbm_lock);
+#endif
+    return 1;
+
+error:
+
+    if (dbm) {
+        apr_sdbm_close(dbm);
+#ifdef GLOBAL_COLLECTION_LOCK
+        apr_global_mutex_unlock(msr->modsecurity->dbm_lock);
+#endif
+    }
+
+    return -1;
+}
diff --git a/apache2/re.c b/apache2/re.c
index 9ded3be7..41e1eb14 100644
--- a/apache2/re.c
+++ b/apache2/re.c
@@ -76,7 +76,7 @@ static int fetch_target_exception(msre_rule *rule, modsec_rec *msr, msre_var *va
     if(rule->actionset == NULL)
         return 0;
 
-    if(rule->actionset->id !=NULL)    {
+    {
 
         myvar = apr_pstrdup(msr->mp, var->name);
 
@@ -353,11 +353,11 @@ char *update_rule_target_ex(modsec_rec *msr, msre_ruleset *ruleset, msre_rule *r
                     rc = msre_parse_targets(ruleset, p, rule->targets, &my_error_msg);
                     if (rc < 0) {
                         if(msr) {
-                            msr_log(msr, 9, "Error parsing rule targets to replace variable");
+                            msr_log(msr, 9, "Error parsing rule targets to replace variable: %s", my_error_msg);
                         }
 #if !defined(MSC_TEST)
                         else {
-                            ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL, " ModSecurity: Error parsing rule targets to replace variable");
+                            ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL, " ModSecurity: Error parsing rule targets to replace variable: %s", my_error_msg);
                         }
 #endif
                         goto end;
@@ -378,7 +378,7 @@ char *update_rule_target_ex(modsec_rec *msr, msre_ruleset *ruleset, msre_rule *r
                     }
 #if !defined(MSC_TEST)
                     else {
-                        ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL, " ModSecurity: Cannot find varibale to replace");
+                        ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL, " ModSecurity: Cannot find variable to replace");
                     }
 #endif
                     goto end;
@@ -386,8 +386,13 @@ char *update_rule_target_ex(modsec_rec *msr, msre_ruleset *ruleset, msre_rule *r
             } else {
 
                 target = strdup(p);
-                if(target == NULL)
-                    return NULL;
+                if(target == NULL) {
+                   if(target_list != NULL)
+                       free(target_list);
+                   if(replace != NULL)
+                       free(replace);
+                   return NULL;
+                  }
 
                 is_negated = is_counting = 0;
                 param = name = value = NULL;
@@ -421,6 +426,8 @@ char *update_rule_target_ex(modsec_rec *msr, msre_ruleset *ruleset, msre_rule *r
                         free(target_list);
                     if(replace != NULL)
                         free(replace);
+                    if(target != NULL)
+                        free(target);
                     if(msr) {
                         msr_log(msr, 9, "Error to update target - [%s] is not valid target", name);
                     }
@@ -499,7 +506,7 @@ char *update_rule_target_ex(modsec_rec *msr, msre_ruleset *ruleset, msre_rule *r
         if(var_appended == 1)  {
             current_targets = msre_generate_target_string(ruleset->mp, rule);
             rule->unparsed = msre_rule_generate_unparsed(ruleset->mp, rule, current_targets, NULL, NULL);
-            rule->p1 = apr_pstrdup(ruleset->mp, current_targets);
+            rule->p1 = current_targets;
             if(msr) {
                 msr_log(msr, 9, "Successfully appended variable");
             }
@@ -512,18 +519,12 @@ char *update_rule_target_ex(modsec_rec *msr, msre_ruleset *ruleset, msre_rule *r
     }
 
 end:
-    if(target_list != NULL) {
+    if(target_list != NULL)
         free(target_list);
-        target_list = NULL;
-    }
-    if(replace != NULL) {
+    if(replace != NULL)
         free(replace);
-        replace = NULL;
-    }
-    if(target != NULL)  {
+    if(target != NULL)
         free(target);
-        target = NULL;
-    }
     return NULL;
 }
 
@@ -637,7 +638,10 @@ static char *msre_generate_target_string(apr_pool_t *pool, msre_rule *rule)  {
 /**
  * Generate an action string from an actionset.
  */
-static char *msre_actionset_generate_action_string(apr_pool_t *pool, const msre_actionset *actionset)  {
+#ifndef DEBUG_CONF
+ static 
+#endif
+char *msre_actionset_generate_action_string(apr_pool_t *pool, const msre_actionset *actionset)  {
     const apr_array_header_t *tarr = NULL;
     const apr_table_entry_t *telts = NULL;
     char *actions = NULL;
@@ -1054,6 +1058,12 @@ int msre_parse_generic(apr_pool_t *mp, const char *text, apr_table_t *vartable,
         /* ignore whitespace */
         while(isspace(*p)) p++;
         if (*p == '\0') return count;
+ 
+        /* ignore empty action */
+        if (*p == ',') {
+          	p++;
+           continue;
+        }
 
         /* we are at the beginning of the name */
         name = p;
diff --git a/apache2/re.h b/apache2/re.h
index c0c54339..e268d8a2 100644
--- a/apache2/re.h
+++ b/apache2/re.h
@@ -75,6 +75,10 @@ int DSOLOCAL rule_id_in_range(int ruleid, const char *range);
 msre_var DSOLOCAL *generate_single_var(modsec_rec *msr, msre_var *var, apr_array_header_t *tfn_arr,
     msre_rule *rule, apr_pool_t *mptmp);
 
+#ifdef DEBUG_CONF
+ char DSOLOCAL* msre_actionset_generate_action_string(apr_pool_t* pool, const msre_actionset* actionset);
+#endif
+
 #if defined(WITH_LUA)
 apr_table_t DSOLOCAL *generate_multi_var(modsec_rec *msr, msre_var *var, apr_array_header_t *tfn_arr,
     msre_rule *rule, apr_pool_t *mptmp);
diff --git a/apache2/re_actions.c b/apache2/re_actions.c
index 02ec07d2..5b6b9dd1 100644
--- a/apache2/re_actions.c
+++ b/apache2/re_actions.c
@@ -183,9 +183,9 @@ int expand_macros(modsec_rec *msr, msc_string *var, msre_rule *rule, apr_pool_t
      *      no macros in the input data.
      */
 
-    data = apr_pstrdup(mptmp, var->value); /* IMP1 Are we modifying data anywhere? */
+    data = var->value;
     arr = apr_array_make(mptmp, 16, sizeof(msc_string *));
-    if ((data == NULL)||(arr == NULL)) return -1;
+    if (arr == NULL) return -1;
 
     text_start = next_text_start = data;
     do {
diff --git a/apache2/re_operators.c b/apache2/re_operators.c
index cfd89525..138a17d6 100644
--- a/apache2/re_operators.c
+++ b/apache2/re_operators.c
@@ -630,18 +630,13 @@ nextround:
     }
 
     if(msr->stream_input_data != NULL && input_body == 1) {
-        memset(msr->stream_input_data, 0x0, msr->stream_input_length);
         free(msr->stream_input_data);
         msr->stream_input_data = NULL;
         msr->stream_input_length = 0;
 #ifdef MSC_LARGE_STREAM_INPUT
         msr->stream_input_allocated_length  = 0;
-
-        msr->stream_input_data = (char *)malloc(size);
-#else
-        msr->stream_input_data = (char *)malloc(size+1);
 #endif
-
+        msr->stream_input_data = (char *)malloc(size+1);
         if(msr->stream_input_data == NULL)  {
             return -1;
         }
@@ -649,16 +644,11 @@ nextround:
         msr->stream_input_length = size;
 #ifdef MSC_LARGE_STREAM_INPUT
         msr->stream_input_allocated_length = size;
-        memset(msr->stream_input_data, 0x0, size);
-#else
-        memset(msr->stream_input_data, 0x0, size+1);
 #endif
         msr->if_stream_changed = 1;
 
         memcpy(msr->stream_input_data, data, size);
-#ifndef MSC_LARGE_STREAM_INPUT
         msr->stream_input_data[size] = '\0';
-#endif
 
         var->value_len = size;
         var->value = msr->stream_input_data;
@@ -688,7 +678,7 @@ static int msre_op_validateHash_param_init(msre_rule *rule, char **error_msg) {
     const char *pattern = rule->op_param;
     #ifdef WITH_PCRE_STUDY
         #ifdef WITH_PCRE_JIT
-    int rc, jit;
+    int rc, jit = 0;
         #endif
     #endif
 
@@ -761,10 +751,9 @@ static int msre_op_validateHash_execute(modsec_rec *msr, msre_rule *rule, msre_v
     char *my_error_msg = NULL;
     int ovector[33];
     int rc;
-    const char *pattern = NULL;
     #ifdef WITH_PCRE_STUDY
        #ifdef WITH_PCRE_JIT
-    int jit;
+    int jit = 0;
        #endif
     #endif
 
@@ -791,8 +780,8 @@ static int msre_op_validateHash_execute(modsec_rec *msr, msre_rule *rule, msre_v
 
             expand_macros(msr, re_pattern, rule, msr->mp);
 
-            pattern = log_escape_re(msr->mp, re_pattern->value);
             if (msr->txcfg->debuglog_level >= 6) {
+                const char *pattern = log_escape_re(msr->mp, re_pattern->value);
                 msr_log(msr, 6, "Escaping pattern [%s]",pattern);
             }
 
@@ -958,7 +947,7 @@ static int msre_op_rx_param_init(msre_rule *rule, char **error_msg) {
     const char *pattern = rule->op_param;
     #ifdef WITH_PCRE_STUDY
        #ifdef WITH_PCRE_JIT
-    int rc, jit;
+    int rc, jit = 0;
        #endif
     #endif
 
@@ -1028,7 +1017,7 @@ static int msre_op_rx_execute(modsec_rec *msr, msre_rule *rule, msre_var *var, c
     msc_parm *mparm = NULL;
     #ifdef WITH_PCRE_STUDY
        #ifdef WITH_PCRE_JIT
-    int jit;
+    int jit = 0;
        #endif
     #endif
 
@@ -1545,10 +1534,10 @@ static const char *gsb_replace_tpath(apr_pool_t *pool, const char *domain, int l
     url = apr_palloc(pool, len + 1);
     data = apr_palloc(pool, len + 1);
 
-    memset(data, 0, len+1);
-    memset(url, 0, len+1);
-
+    data[0] = '\0';
+    
     memcpy(url, domain, len);
+    url[len] = 0;
 
     while(( pos = strstr(url , "/./" )) != NULL) {
         match = 1;
@@ -2841,7 +2830,7 @@ static int msre_op_verifyCC_execute(modsec_rec *msr, msre_rule *rule, msre_var *
     msc_parm *mparm = NULL;
     #ifdef WITH_PCRE_STUDY
        #ifdef WITH_PCRE_JIT
-    int jit;
+    int jit = 0;
        #endif
     #endif
 
@@ -3171,7 +3160,7 @@ static int msre_op_verifyCPF_execute(modsec_rec *msr, msre_rule *rule, msre_var
     msc_parm *mparm = NULL;
     #ifdef WITH_PCRE_STUDY
        #ifdef WITH_PCRE_JIT
-    int jit;
+    int jit = 0;
        #endif
     #endif
 
@@ -3485,7 +3474,7 @@ static int msre_op_verifySSN_execute(modsec_rec *msr, msre_rule *rule, msre_var
     msc_parm *mparm = NULL;
     #ifdef WITH_PCRE_STUDY
        #ifdef WITH_PCRE_JIT
-    int jit;
+    int jit = 0;
        #endif
     #endif
 
diff --git a/doc/README.txt b/doc/README.txt
index ec0ed357..75bfac09 100644
--- a/doc/README.txt
+++ b/doc/README.txt
@@ -8,4 +8,4 @@ Please access the ModSecurity Github space to access the below documentation.
     * Reference Manual
     * RoadMap
 
-https://github.com/SpiderLabs/ModSecurity/wiki/
+https://github.com/owasp-modsecurity/ModSecurity/wiki/
diff --git a/iis/dependencies/howto.txt b/iis/dependencies/howto.txt
index 55f9184b..830851f9 100644
--- a/iis/dependencies/howto.txt
+++ b/iis/dependencies/howto.txt
@@ -38,7 +38,7 @@ ssdeep-2.13
 
 --------------------------------------
 
-1. Create working directory (e.g. c:\work) and drop the latest clone from ModSecurity's 2.x Github (https://github.com/SpiderLabs/ModSecurity/archive/v2/master.zip)
+1. Create working directory (e.g. c:\work) and drop the latest clone from ModSecurity's 2.x Github (https://github.com/owasp-modsecurity/ModSecurity/archive/v2/master.zip)
 2. Make sure the prerequisites mentioned above are all set
 3. If you haven't download the dependency files before, uncomment the "@call download_files.bat" line on build_dependencies.bat to have them downloaded prior
 4. Open a command prompt (cmd.exe) and head to the "iis" folder inside ModSecurity tree working directory (e.g. cd c:\work\ModSecurity\iis)
diff --git a/iis/installer.wxs b/iis/installer.wxs
index 6ef3c05e..17ed02c0 100644
--- a/iis/installer.wxs
+++ b/iis/installer.wxs
@@ -616,8 +616,8 @@
                 <Control Id="Title" Type="Text" X="15" Y="6" Width="210" Height="15" Transparent="yes" NoPrefix="yes" Text="{\WixUI_Font_Title}IIS Setup" />
                 <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes" Text="Choose to configure ModSecurity on IIS or not." />
                 <Control Id="Text" Type="Text" X="25" Y="55" Width="320" Height="50" Text="ModSecurityIIS needs to be configured under IIS as a module. It is recommended to perform this configuration during the installation. However, if you are facing problems in the installation, the recomendation is to disable this step. This will facilitate the debugging process since the files will be installed in place. Note that some scripts will be installed along with ModSecurity common files that can be later used to help this configuration/debugging process." />
-		<Control Type="CheckBox" Id="ConfigureIIS" Width="200" Height="14" X="25" Y="124" CheckBoxValue="1" Property="IIS_SETUP" Text="Perform ModSecurityIIS configuration." />
-                <Control Type="Text" Id="troubleshooting" Width="314" Height="67" X="26" Y="161" Text="For further information about problems during the installation, have a look at ModSecurityIIS Troubleshooting guide. Available at: https://github.com/SpiderLabs/ModSecurity/wiki/IIS-Troubleshooting. ATTENTION: This installation process no longer install OWASP CRS. Please refer to the OWASP CRS Project to understand how to install it. " />
+                <Control Type="CheckBox" Id="ConfigureIIS" Width="200" Height="14" X="25" Y="124" CheckBoxValue="1" Property="IIS_SETUP" Text="Perform ModSecurityIIS configuration." />
+                <Control Type="Text" Id="troubleshooting" Width="314" Height="67" X="26" Y="161" Text="For further information about problems during the installation, have a look at ModSecurityIIS Troubleshooting guide. Available at: https://github.com/owasp-modsecurity/ModSecurity/wiki/IIS-Troubleshooting. ATTENTION: This installation process no longer install OWASP CRS. Please refer to the OWASP CRS Project to understand how to install it. " />
             </Dialog>
             <Binary Id="bannrbmp" SourceFile="wix\banner.jpg" />
             <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />