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

Fixed PCRE defines so compiles can be done with really old versions of pcre (MODSEC-165).

Browse Source
This commit is contained in:
b1v1r
2010-07-16 21:49:55 +00:00
parent 3d50bbdda1
commit f47d639839
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apache2/msc_pcre.c
View File

@@ -67,7 +67,6 @@ void *msc_pregcomp_ex(apr_pool_t *pool, const char *pattern, int options,
#ifdef WITH_PCRE_STUDY #ifdef WITH_PCRE_STUDY
pe = pcre_study(regex->re, 0, &errptr); pe = pcre_study(regex->re, 0, &errptr);
#endif
/* Setup the pcre_extra record if pcre_study did not already do it */ /* Setup the pcre_extra record if pcre_study did not already do it */
if (pe == NULL) { if (pe == NULL) {
@@ -77,6 +76,7 @@ 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));
} }
#endif
#ifdef PCRE_EXTRA_MATCH_LIMIT #ifdef PCRE_EXTRA_MATCH_LIMIT
/* If match limit is available, then use it */ /* If match limit is available, then use it */
@@ -94,7 +94,9 @@ void *msc_pregcomp_ex(apr_pool_t *pool, const char *pattern, int options,
} }
#endif /* MODSEC_PCRE_MATCH_LIMIT */ #endif /* MODSEC_PCRE_MATCH_LIMIT */
#else #else
#ifdef MODSEC_PCRE_MATCH_LIMIT
#pragma message ( "This PCRE version does not support match limits! Upgrade to at least PCRE v6.5." ) #pragma message ( "This PCRE version does not support match limits! Upgrade to at least PCRE v6.5." )
#endif /* MODSEC_PCRE_MATCH_LIMIT */
#endif /* PCRE_EXTRA_MATCH_LIMIT */ #endif /* PCRE_EXTRA_MATCH_LIMIT */
#ifdef PCRE_EXTRA_MATCH_LIMIT_RECURSION #ifdef PCRE_EXTRA_MATCH_LIMIT_RECURSION
@@ -113,7 +115,9 @@ void *msc_pregcomp_ex(apr_pool_t *pool, const char *pattern, int options,
} }
#endif /* MODSEC_PCRE_MATCH_LIMIT_RECURSION */ #endif /* MODSEC_PCRE_MATCH_LIMIT_RECURSION */
#else #else
#ifdef MODSEC_PCRE_MATCH_LIMIT_RECURSION
#pragma message ( "This PCRE version does not support match recursion limits! Upgrade to at least PCRE v6.5." ) #pragma message ( "This PCRE version does not support match recursion limits! Upgrade to at least PCRE v6.5." )
#endif /* MODSEC_PCRE_MATCH_LIMIT_RECURSION */
#endif /* PCRE_EXTRA_MATCH_LIMIT_RECURSION */ #endif /* PCRE_EXTRA_MATCH_LIMIT_RECURSION */
regex->pe = pe; regex->pe = pe;