github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-10-04 13:33:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

Implemented merge_bodylimitaction_value() for BodyLimitAction

Browse Source 
This change makes the following directives to be merged properly:

SecRequestBodyLimitAction
SecResponseBodyLimitAction
This commit is contained in:
Andrei Belov
2018-12-25 18:50:24 +03:00
committed by Felipe Zimmerle
parent 3c41751eda
commit 7c19ffea64
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
headers/modsecurity/rules_properties.h
View File

@@ -47,6 +47,11 @@
to = (from == PropertyNotSetRuleEngine) ? default : from; \ to = (from == PropertyNotSetRuleEngine) ? default : from; \
} }
#define merge_bodylimitaction_value(to, from, default) \
if (to == PropertyNotSetBodyLimitAction) { \
to = (from == PropertyNotSetBodyLimitAction) ? default : from; \
}
#ifdef __cplusplus #ifdef __cplusplus
namespace modsecurity { namespace modsecurity {
@@ -380,13 +385,13 @@ class RulesProperties {
to->m_requestBodyLimit.merge(&from->m_requestBodyLimit); to->m_requestBodyLimit.merge(&from->m_requestBodyLimit);
to->m_responseBodyLimit.merge(&from->m_responseBodyLimit); to->m_responseBodyLimit.merge(&from->m_responseBodyLimit);
if (from->m_requestBodyLimitAction != PropertyNotSetBodyLimitAction) { merge_bodylimitaction_value(to->m_requestBodyLimitAction,
to->m_requestBodyLimitAction = from->m_requestBodyLimitAction; from->m_requestBodyLimitAction,
} PropertyNotSetBodyLimitAction);
if (from->m_responseBodyLimitAction != PropertyNotSetBodyLimitAction) { merge_bodylimitaction_value(to->m_responseBodyLimitAction,
to->m_responseBodyLimitAction = from->m_responseBodyLimitAction; from->m_responseBodyLimitAction,
} PropertyNotSetBodyLimitAction);
to->m_uploadFileLimit.merge(&from->m_uploadFileLimit); to->m_uploadFileLimit.merge(&from->m_uploadFileLimit);
to->m_uploadFileMode.merge(&from->m_uploadFileMode); to->m_uploadFileMode.merge(&from->m_uploadFileMode);