In Windows, create Memory and Lock in the global namespace.

Author: cp5555

apache2/ag_mdb/ag_mdb.cpp

@@ -58,14 +58,14 @@ int Lock_create(struct agmdb_lock *new_lock, const char* lock_name, int lock_nam
         return AGMDB_SUCCESS_LOCK_OPEN;
     }
 #else
-    read_lock_name_len = (strlen(READ_LOCK_PREFIX) + strlen(lock_name) + 1) * sizeof(char);
-    write_lock_name_len = (strlen(WRITE_LOCK_PREFIX) + strlen(lock_name) + 1) * sizeof(char);
+    read_lock_name_len = (strlen(READ_LOCK_SUFFIX) + strlen(lock_name) + 1) * sizeof(char);
+    write_lock_name_len = (strlen(WRITE_LOCK_SUFFIX) + strlen(lock_name) + 1) * sizeof(char);
 
     if (AGMDB_isstring(lock_name, lock_name_length) != AGMDB_SUCCESS)
         return AGMDB_ERROR_LOCK_WIN_NAME_INVALID_STRING;
 
     read_lock_name = (char *)malloc(read_lock_name_len * sizeof(char));
-    sprintf_s(read_lock_name, read_lock_name_len, "%s%s", READ_LOCK_PREFIX, lock_name);
+    sprintf_s(read_lock_name, read_lock_name_len, "%s%s", lock_name, READ_LOCK_SUFFIX);
     new_lock->read_lock_handle = CreateMutex(
         NULL,               // Default security settings.
         FALSE,              // Do not take the lock after created.
@@ -81,7 +81,7 @@ int Lock_create(struct agmdb_lock *new_lock, const char* lock_name, int lock_nam
         lock_exists = true;
 
     write_lock_name = (char *)malloc(write_lock_name_len * sizeof(char));
-    sprintf_s(write_lock_name, write_lock_name_len, "%s%s", WRITE_LOCK_PREFIX, lock_name);
+    sprintf_s(write_lock_name, write_lock_name_len, "%s%s", lock_name, WRITE_LOCK_SUFFIX);
     new_lock->write_lock_handle = CreateMutex(
         NULL,               // Default security settings.
         FALSE,              // Do not take the lock after created.

apache2/ag_mdb/ag_mdb_internal.h

@@ -341,8 +341,8 @@ int Entry_setKeyValue(CPTR_VOID shm_base, PTR_OFFSET entry_id, const char* key,
  ** Define the name prefix of Read/Write lock on Windows
  */
 #ifdef _WIN32
-#define READ_LOCK_PREFIX "DB_LOCK_READ_"
-#define WRITE_LOCK_PREFIX "DB_LOCK_WRITE_"
+#define READ_LOCK_SUFFIX "_DB_LOCK_READ"
+#define WRITE_LOCK_SUFFIX "_DB_LOCK_WRITE"
 #endif
 
 /**

apache2/persist_dbm.c

@@ -609,7 +609,11 @@ static int collection_store_ex(int db_option, modsec_rec *msr, apr_table_t *col)
         if(ag_dbm == NULL) {
             //Create the DB
             root_dcfg = msr->dcfg1->root_config;
+#ifdef _WIN32           
+            dbm_filename = apr_pstrcat(root_dcfg->mp, "Global\\", root_dcfg->data_dir, "/", var_name->value, NULL);
+#else
             dbm_filename = apr_pstrcat(root_dcfg->mp, root_dcfg->data_dir, "/", var_name->value, NULL);
+#endif
             if(root_dcfg == NULL){
                 msr_log(msr, 1, "collection_retrieve_ex_agmdb: Cannot find root_config in msr->dcfg1.");
                 goto error;
@@ -621,7 +625,7 @@ static int collection_store_ex(int db_option, modsec_rec *msr, apr_table_t *col)
 
             rc = AGMDB_openDB(new_handle->handle, dbm_filename, strlen(dbm_filename), MAXIMUM_AGMDB_ENTRY_NUM);
             if(AGMDB_isError(rc)){
-                msr_log(msr, 1, "collection_retrieve_ex_agmdb: Failed to create DBM name: %s. Error info: %s", apr_psprintf(msr->mp, "%.*s", var_name->value_len, var_name->value), AGMDB_getErrorInfo(rc));
+                msr_log(msr, 1, "collection_retrieve_ex_agmdb: Failed to create DBM name: %s. Error info: %s", dbm_filename, AGMDB_getErrorInfo(rc));
                 goto error;
             }
             ag_dbm = new_handle->handle;