github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-16 07:56:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Move transformation cache rec def re.h from modsecurity.h

Browse Source
This commit is contained in:
brectanus 2007-06-11 21:15:14 +00:00
parent 71eb6e17a4
commit 46d7a5ec6f
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apache2/modsecurity.h
View File

@ -25,7 +25,6 @@ typedef struct msc_engine msc_engine;
typedef struct msc_data_chunk msc_data_chunk; typedef struct msc_data_chunk msc_data_chunk;
typedef struct msc_arg msc_arg; typedef struct msc_arg msc_arg;
typedef struct msc_string msc_string; typedef struct msc_string msc_string;
typedef struct msc_cache_rec msc_cache_rec;
#if !(defined(WIN32) || defined(NETWARE) || defined(SOLARIS2)) #if !(defined(WIN32) || defined(NETWARE) || defined(SOLARIS2))
#define DSOLOCAL __attribute__((visibility("hidden"))) #define DSOLOCAL __attribute__((visibility("hidden")))

8
apache2/re.c
View File

@ -1532,9 +1532,9 @@ apr_status_t msre_rule_process(msre_rule *rule, modsec_rec *msr) {
if (usecache) { if (usecache) {
/* ENH1: Add flag to vars to tell which ones can change across phases store the rest in a global cache */ /* ENH1: Add flag to vars to tell which ones can change across phases store the rest in a global cache */
if (carr == NULL) { if (carr == NULL) {
carr = (msre_cache_rec **)apr_pcalloc(msr->mp, (sizeof(msc_cache_rec *) * (PHASE_LAST + 1))); carr = (msre_cache_rec **)apr_pcalloc(msr->mp, (sizeof(msre_cache_rec *) * (PHASE_LAST + 1)));
if (carr == NULL) return -1; if (carr == NULL) return -1;
memset(carr, 0, (sizeof(msc_cache_rec *) * (PHASE_LAST + 1))); memset(carr, 0, (sizeof(msre_cache_rec *) * (PHASE_LAST + 1)));
apr_hash_set(msr->tcache, tfnskey, APR_HASH_KEY_STRING, carr); apr_hash_set(msr->tcache, tfnskey, APR_HASH_KEY_STRING, carr);
} }
crec = carr[msr->phase] = (msre_cache_rec *)apr_pcalloc(msr->mp, sizeof(msre_cache_rec)); crec = carr[msr->phase] = (msre_cache_rec *)apr_pcalloc(msr->mp, sizeof(msre_cache_rec));
@ -1588,13 +1588,13 @@ apr_status_t msre_rule_process(msre_rule *rule, modsec_rec *msr) {
if (msr->txcfg->debuglog_level >= 9) { if (msr->txcfg->debuglog_level >= 9) {
apr_hash_index_t *hi; apr_hash_index_t *hi;
void *dummy; void *dummy;
msc_cache_rec **rec; msre_cache_rec **rec;
int hn = 0; int hn = 0;
int ri; int ri;
for (hi = apr_hash_first(msr->mp, msr->tcache); hi; hi = apr_hash_next(hi)) { for (hi = apr_hash_first(msr->mp, msr->tcache); hi; hi = apr_hash_next(hi)) {
hn++; hn++;
apr_hash_this(hi, NULL, NULL, &dummy); apr_hash_this(hi, NULL, NULL, &dummy);
rec = (msc_cache_rec **)dummy; rec = (msre_cache_rec **)dummy;
if (rec == NULL) continue; if (rec == NULL) continue;
for (ri = PHASE_FIRST; ri <= PHASE_LAST; ri++) { for (ri = PHASE_FIRST; ri <= PHASE_LAST; ri++) {