From ab4d5acce61b219ffbc361d08c4d90109b608b99 Mon Sep 17 00:00:00 2001
From: brenosilva <brenosilva@9017d574-64ec-4062-9424-5e00b32a252b>
Date: Fri, 15 Jun 2012 20:27:21 +0000
Subject: [PATCH] Fix windows error compilation

---
 apache2/msc_crypt.c   | 1 +
 apache2/msc_tree.h    | 6 +++---
 apache2/persist_dbm.c | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/apache2/msc_crypt.c b/apache2/msc_crypt.c
index 1838bf9f..1ad85dee 100644
--- a/apache2/msc_crypt.c
+++ b/apache2/msc_crypt.c
@@ -18,6 +18,7 @@
 #include "acmp.h"
 #include "libxml/HTMLtree.h"
 #include "libxml/uri.h"
+#include <string.h>
 
 /**
  * \brief Normalize path in URI
diff --git a/apache2/msc_tree.h b/apache2/msc_tree.h
index 7c4d9009..96b9fa57 100644
--- a/apache2/msc_tree.h
+++ b/apache2/msc_tree.h
@@ -75,8 +75,8 @@ struct TreeRoot {
     CPTTree *ipv6_tree;
 };
 
-DSOLOCAL CPTTree *CPTCreateRadixTree(apr_pool_t *pool);
-DSOLOCAL TreeNode *CPTIpMatch(modsec_rec *, uint8_t *, CPTTree *, int);
-DSOLOCAL TreeNode *TreeAddIP(const char *, CPTTree *, int);
+CPTTree  DSOLOCAL  *CPTCreateRadixTree(apr_pool_t *pool);
+TreeNode DSOLOCAL *CPTIpMatch(modsec_rec *, uint8_t *, CPTTree *, int);
+TreeNode DSOLOCAL *TreeAddIP(const char *, CPTTree *, int);
 
 #endif /*__MSC_TREE_H__ */
diff --git a/apache2/persist_dbm.c b/apache2/persist_dbm.c
index 215ebcda..4bb6a3e1 100644
--- a/apache2/persist_dbm.c
+++ b/apache2/persist_dbm.c
@@ -586,7 +586,7 @@ int collections_remove_stale(modsec_rec *msr, const char *col_name) {
         goto error;
     }
 
-    if(strcasestr(col_name,"user") || strcasestr(col_name,"session") || strcasestr(col_name,"resource"))
+    if(strstr(col_name,"USER") || strstr(col_name,"SESSION") || strstr(col_name, "RESOURCE"))
         dbm_filename = apr_pstrcat(msr->mp, msr->txcfg->data_dir, "/", msr->txcfg->webappid, "_", col_name, NULL);
     else
         dbm_filename = apr_pstrcat(msr->mp, msr->txcfg->data_dir, "/", col_name, NULL);