github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-14 05:45:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix SecUploadDir configuration merge

Browse Source
This commit is contained in:
Felipe Zimmerle 2018-03-23 11:32:46 -03:00
parent ab3afb2ed2
commit 9537cfceed
No known key found for this signature in database
GPG Key ID: E6DFB08CE8B11277
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -1,6 +1,8 @@
v3.0.x - YYYY-MMM-DD (To be released) v3.0.x - YYYY-MMM-DD (To be released)
------------------------------------- -------------------------------------
- Fix SecUploadDir configuration merge
[Issue #1720 - @zimmerle, @gjvanetten]
- Include all prerequisites for "make check" into dist archive - Include all prerequisites for "make check" into dist archive
[Issue #1716 - @defanator] [Issue #1716 - @defanator]
- Fix: Reverse logic of checking output in @inspectFile - Fix: Reverse logic of checking output in @inspectFile

5
headers/modsecurity/rules_properties.h
View File

@ -328,26 +328,31 @@ class RulesProperties {
if (from->m_uploadDirectory.m_set == true) { if (from->m_uploadDirectory.m_set == true) {
to->m_uploadDirectory.m_value = from->m_uploadDirectory.m_value; to->m_uploadDirectory.m_value = from->m_uploadDirectory.m_value;
to->m_uploadDirectory.m_set = true;
} }
if (from->m_uploadTmpDirectory.m_set == true) { if (from->m_uploadTmpDirectory.m_set == true) {
to->m_uploadTmpDirectory.m_value = \ to->m_uploadTmpDirectory.m_value = \
from->m_uploadTmpDirectory.m_value; from->m_uploadTmpDirectory.m_value;
to->m_uploadTmpDirectory.m_set = true;
} }
if (from->m_secArgumentSeparator.m_set == true) { if (from->m_secArgumentSeparator.m_set == true) {
to->m_secArgumentSeparator.m_value = \ to->m_secArgumentSeparator.m_value = \
from->m_secArgumentSeparator.m_value; from->m_secArgumentSeparator.m_value;
to->m_secArgumentSeparator.m_set = true;
} }
if (from->m_secWebAppId.m_set == true) { if (from->m_secWebAppId.m_set == true) {
to->m_secWebAppId.m_value = \ to->m_secWebAppId.m_value = \
from->m_secWebAppId.m_value; from->m_secWebAppId.m_value;
to->m_secWebAppId.m_set = true;
} }
if (from->m_unicodeMapTable.m_set == true) { if (from->m_unicodeMapTable.m_set == true) {
to->m_unicodeMapTable.m_unicode_map_table = \ to->m_unicodeMapTable.m_unicode_map_table = \
from->m_unicodeMapTable.m_unicode_map_table; from->m_unicodeMapTable.m_unicode_map_table;
to->m_unicodeMapTable.m_set = true;
} }
if (from->m_httpblKey.m_set == true) { if (from->m_httpblKey.m_set == true) {