Complete merging of particular rule properties

defanator · Felipe Zimmerle · commit 9b24199a22c4 · 2018-12-24T13:58:28.000-03:00
Closes owasp-modsecurity/ModSecurity-nginx#142 issue.
diff --git a/headers/modsecurity/rules_properties.h b/headers/modsecurity/rules_properties.h
@@ -343,10 +343,12 @@ class RulesProperties {
 
         if (from->m_requestBodyLimit.m_set == true) {
             to->m_requestBodyLimit.m_value = from->m_requestBodyLimit.m_value;
+            to->m_requestBodyLimit.m_set = true;
         }
 
         if (from->m_responseBodyLimit.m_set == true) {
             to->m_responseBodyLimit.m_value = from->m_responseBodyLimit.m_value;
+            to->m_responseBodyLimit.m_set = true;
         }
 
         if (from->m_requestBodyLimitAction != PropertyNotSetBodyLimitAction) {
@@ -359,10 +361,12 @@ class RulesProperties {
 
         if (from->m_uploadFileLimit.m_set == true) {
             to->m_uploadFileLimit.m_value = from->m_uploadFileLimit.m_value;
+            to->m_uploadFileLimit.m_set = true;
         }
 
         if (from->m_uploadFileMode.m_set == true) {
             to->m_uploadFileMode.m_value = from->m_uploadFileMode.m_value;
+            to->m_uploadFileMode.m_set = true;
         }
 
         if (from->m_uploadDirectory.m_set == true) {

Original file line number	Diff line number	Diff line change
`@@ -343,10 +343,12 @@ class RulesProperties {`
`343`	`343`
`344`	`344`	`if (from->m_requestBodyLimit.m_set == true) {`
`345`	`345`	`to->m_requestBodyLimit.m_value = from->m_requestBodyLimit.m_value;`
	`346`	`+ to->m_requestBodyLimit.m_set = true;`
`346`	`347`	`}`
`347`	`348`
`348`	`349`	`if (from->m_responseBodyLimit.m_set == true) {`
`349`	`350`	`to->m_responseBodyLimit.m_value = from->m_responseBodyLimit.m_value;`
	`351`	`+ to->m_responseBodyLimit.m_set = true;`
`350`	`352`	`}`
`351`	`353`
`352`	`354`	`if (from->m_requestBodyLimitAction != PropertyNotSetBodyLimitAction) {`
`@@ -359,10 +361,12 @@ class RulesProperties {`
`359`	`361`
`360`	`362`	`if (from->m_uploadFileLimit.m_set == true) {`
`361`	`363`	`to->m_uploadFileLimit.m_value = from->m_uploadFileLimit.m_value;`
	`364`	`+ to->m_uploadFileLimit.m_set = true;`
`362`	`365`	`}`
`363`	`366`
`364`	`367`	`if (from->m_uploadFileMode.m_set == true) {`
`365`	`368`	`to->m_uploadFileMode.m_value = from->m_uploadFileMode.m_value;`
	`369`	`+ to->m_uploadFileMode.m_set = true;`
`366`	`370`	`}`
`367`	`371`
`368`	`372`	`if (from->m_uploadDirectory.m_set == true) {`