Update apache_conf regular expression to exclude whitespace. #2416
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
|
@miah can you please rebase on master so we can try to get travis fixed for this PR? |
Signed-off-by: Miah Johnson <miah@chia-pet.org>
trailing whitespace. Signed-off-by: Miah Johnson <miah@chia-pet.org>
array item. This is expected as we do not override the key_values default setting of '1' when passing the raw configuration to SimpleConfig. Signed-off-by: Miah Johnson <miah@chia-pet.org>
lookahead that checks if the line ends with one or more spaces. If the lookahead succeeds we non-greedily capture, and when it fails we greedily capture. Signed-off-by: Miah Johnson <miah@chia-pet.org>
adamleff
reviewed
Dec 22, 2017
adamleff
approved these changes
Dec 22, 2017
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.
This PR updates the regular expression used in apache_conf to use a conditional lookahead to greedily or non-greedily capture configuration values to ensure our values don't end with whitespace.
Thanks to feedback from @adamleff and help from @jerryaldrichiii this fix now works without modifying SimpleConfig. =)
Fixes #1241