github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2026-01-14 15:37:10 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed compiles using PCRE pre v6.5 (ie Apache includes 5.0)

Browse Source
This commit is contained in:
b1v1r
2010-02-05 18:23:18 +00:00
parent 81105d03c4
commit cd730842da
2 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
apache2/msc_pcre.c
View File

@@ -78,28 +78,43 @@ void *msc_pregcomp_ex(apr_pool_t *pool, const char *pattern, int options,
memset(pe, 0, sizeof(pcre_extra)); memset(pe, 0, sizeof(pcre_extra));
} }
/* Set some PCRE limits */ #ifdef PCRE_EXTRA_MATCH_LIMIT
/* If match limit is available, then use it */
/* Use ModSecurity runtime defaults */
if (match_limit > 0) { if (match_limit > 0) {
pe->match_limit = match_limit; pe->match_limit = match_limit;
pe->flags |= PCRE_EXTRA_MATCH_LIMIT; pe->flags |= PCRE_EXTRA_MATCH_LIMIT;
} }
#ifdef MODSEC_PCRE_MATCH_LIMIT #ifdef MODSEC_PCRE_MATCH_LIMIT
/* Default to ModSecurity compiled defaults */
else { else {
pe->match_limit = MODSEC_PCRE_MATCH_LIMIT; pe->match_limit = MODSEC_PCRE_MATCH_LIMIT;
pe->flags |= PCRE_EXTRA_MATCH_LIMIT; pe->flags |= PCRE_EXTRA_MATCH_LIMIT;
} }
#endif #endif /* MODSEC_PCRE_MATCH_LIMIT */
#else
#warning This PCRE version does not support match limits! Upgrade to at least PCRE v6.5.
#endif /* PCRE_EXTRA_MATCH_LIMIT */
#ifdef PCRE_EXTRA_MATCH_LIMIT_RECURSION
/* If match limit recursion is available, then use it */
/* Use ModSecurity runtime defaults */
if (match_limit_recursion > 0) { if (match_limit_recursion > 0) {
pe->match_limit_recursion = match_limit_recursion; pe->match_limit_recursion = match_limit_recursion;
pe->flags |= PCRE_EXTRA_MATCH_LIMIT_RECURSION; pe->flags |= PCRE_EXTRA_MATCH_LIMIT_RECURSION;
} }
#ifdef MODSEC_PCRE_MATCH_LIMIT_RECURSION #ifdef MODSEC_PCRE_MATCH_LIMIT_RECURSION
/* Default to ModSecurity compiled defaults */
else { else {
pe->match_limit_recursion = MODSEC_PCRE_MATCH_LIMIT_RECURSION; pe->match_limit_recursion = MODSEC_PCRE_MATCH_LIMIT_RECURSION;
pe->flags |= PCRE_EXTRA_MATCH_LIMIT_RECURSION; pe->flags |= PCRE_EXTRA_MATCH_LIMIT_RECURSION;
} }
#endif #endif /* MODSEC_PCRE_MATCH_LIMIT_RECURSION */
#else
#warning This PCRE version does not support match recursion limits! Upgrade to at least PCRE v6.5.
#endif /* PCRE_EXTRA_MATCH_LIMIT_RECURSION */
regex->pe = pe; regex->pe = pe;

11
apache2/msc_pcre.h
View File

@@ -22,6 +22,17 @@
typedef struct msc_regex_t msc_regex_t; typedef struct msc_regex_t msc_regex_t;
#include "pcre.h" #include "pcre.h"
#ifndef PCRE_ERROR_MATCHLIMIT
/* Define for compile, but not valid in this version of PCRE. */
#define PCRE_ERROR_MATCHLIMIT (-8)
#endif /* PCRE_ERROR_MATCHLIMIT */
#ifndef PCRE_ERROR_RECURSIONLIMIT
/* Define for compile, but not valid in this version of PCRE. */
#define PCRE_ERROR_RECURSIONLIMIT (-21)
#endif /* PCRE_ERROR_RECURSIONLIMIT */
#include "apr_general.h" #include "apr_general.h"
#include "modsecurity.h" #include "modsecurity.h"