Improve configuration merge logic for a number of directives #1990
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This change makes the following directives to be merged properly: SecRequestBodyLimit SecResponseBodyLimit SecUploadFileLimit SecUploadFileMode SecUploadDir SecTmpDir SecArgumentSeparator SecWebAppId SecHttpBlKey
This change makes the following directives to be merged properly: SecRequestBodyAccess SecResponseBodyAccess SecXmlExternalEntity SecUploadKeepFiles SecTmpSaveUploadedFiles
This change makes the SecRuleEngine directive to be merged properly.
This change makes the following directives to be merged properly: SecRequestBodyLimitAction SecResponseBodyLimitAction
defanator
added a commit
to defanator/ModSecurity-nginx
that referenced
this pull request
Dec 26, 2018
zimmerle
pushed a commit
to owasp-modsecurity/ModSecurity-nginx
that referenced
this pull request
Dec 26, 2018
See the following for details: #142 owasp-modsecurity/ModSecurity#1978 #143 owasp-modsecurity/ModSecurity#1990
|
@zimmerle could you please re-run https://travis-ci.org/SpiderLabs/ModSecurity/builds/472256050 to make Travis happy after |
|
Seems like the build has passed @defanator :) |
|
Merged :) Thanks! |
defanator
added a commit
to defanator/ModSecurity-nginx
that referenced
this pull request
Jan 9, 2019
zimmerle
pushed a commit
to owasp-modsecurity/ModSecurity-nginx
that referenced
this pull request
Jan 9, 2019
pracj3am
pushed a commit
to cdn77/ModSecurity-nginx
that referenced
this pull request
Nov 4, 2022
pracj3am
pushed a commit
to cdn77/ModSecurity-nginx
that referenced
this pull request
Nov 4, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Namely,
Tests for nginx connector will follow.