caddyfile: Allow block to do nothing if nothing passed to import
#7206
Conversation
This file contains hidden or 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
Contributor
|
@francislavoie i guess the chance that anyone is using {block} or {blocks.key} in their caddyfile and not trying to use the feature is very very small. i dont think anyone complained. maybe we could put a small note in the release, but im not sure its needed dont really see any problems, the code is good. |
francislavoie
approved these changes
Sep 12, 2025
Member
francislavoie
left a comment
francislavoie
left a comment
There was a problem hiding this comment.
Ah sorry, I didn't see this PR for some reason when you made it. LGTM!
and add parse-test
francislavoie
force-pushed
the
feature/CADDY-6821-Change-parser-to-allow-not-replacing-block-directives
branch
from
5e8c1f3 to
cca54a9
Compare
francislavoie
changed the title
block to do nothing if nothing passed to import
mholt
approved these changes
Sep 12, 2025
4 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Fixes #6821
Before the parser left the
{block}-token (or{blocks.key}-token) as is during parsing, if the corresponding import did not specify any block (pasting it into the import-body as a literal).After this change, the parser ignores
{block}tokens, if there is no body to replace it with.Also add two adapt-tests to pin the new behavior of
{block}and{blocks.key}respectively.