Fix windows error compilation

This commit is contained in:
brenosilva 2012-06-15 20:27:21 +00:00
parent 88331d1221
commit ab4d5acce6
3 changed files with 5 additions and 4 deletions

View File

@ -18,6 +18,7 @@
#include "acmp.h" #include "acmp.h"
#include "libxml/HTMLtree.h" #include "libxml/HTMLtree.h"
#include "libxml/uri.h" #include "libxml/uri.h"
#include <string.h>
/** /**
* \brief Normalize path in URI * \brief Normalize path in URI

View File

@ -75,8 +75,8 @@ struct TreeRoot {
CPTTree *ipv6_tree; CPTTree *ipv6_tree;
}; };
DSOLOCAL CPTTree *CPTCreateRadixTree(apr_pool_t *pool); CPTTree DSOLOCAL *CPTCreateRadixTree(apr_pool_t *pool);
DSOLOCAL TreeNode *CPTIpMatch(modsec_rec *, uint8_t *, CPTTree *, int); TreeNode DSOLOCAL *CPTIpMatch(modsec_rec *, uint8_t *, CPTTree *, int);
DSOLOCAL TreeNode *TreeAddIP(const char *, CPTTree *, int); TreeNode DSOLOCAL *TreeAddIP(const char *, CPTTree *, int);
#endif /*__MSC_TREE_H__ */ #endif /*__MSC_TREE_H__ */

View File

@ -586,7 +586,7 @@ int collections_remove_stale(modsec_rec *msr, const char *col_name) {
goto error; 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); dbm_filename = apr_pstrcat(msr->mp, msr->txcfg->data_dir, "/", msr->txcfg->webappid, "_", col_name, NULL);
else else
dbm_filename = apr_pstrcat(msr->mp, msr->txcfg->data_dir, "/", col_name, NULL); dbm_filename = apr_pstrcat(msr->mp, msr->txcfg->data_dir, "/", col_name, NULL);