Simplify protocol logic for Apache #264
Merged
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
gstrauss
force-pushed
the
upd/apache-protocols
branch
from
8cc4504
to
5af341a
Compare
Reducing template bloat is worthwhile. |
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.
Folding two different
SSLProtocolblocks into one, without any change to the logic in use or the final output.Rationale
The only condition targeting Apache 2.3.16 is whether to explicitly exclude SSLv2 or not (as it is disabled by default from that point on), not worth maintaining as separate blocks with different formatting etc.
Any SSLv3 logic is removed as it is no longer present in any configs and is also only disabled completely.
Significant changes and points to review
Absolutely no impact to the actual output.
The
2.3.16condition for explicit SSLv2 removal is just kept within the single block, SSLv3 removal is unconditional.(Includes some indentation and whitespace control for better readability, but not as "neat" as before; however the deduplication is hopefully worth it.)
Testing
https://upd-apache-protocols--mozsslconf-dev.netlify.app/#server=apache&version=2.2.22
https://upd-apache-protocols--mozsslconf-dev.netlify.app/#server=apache&version=2.2.22&config=old
vs.
https://upd-apache-protocols--mozsslconf-dev.netlify.app/#server=apache&version=2.4.24
https://upd-apache-protocols--mozsslconf-dev.netlify.app/#server=apache&version=2.4.24&config=old
https://upd-apache-protocols--mozsslconf-dev.netlify.app/#server=apache&config=modern