caddyhttp: Merge query matchers in Caddyfile #3839
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
Also, turns out that `Add` on headers will work even if there's nothing there yet, so we can remove the condition I introduced in caddyserver#3832
mholt
approved these changes
Nov 2, 2020
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.
I noticed this while revising the matcher docs,
querywasn't adapting as advertised. It was only letting you have one value per key, and if you specified more tokens, it would fail becaused.Args(&query)would end up hitting every 2nd token because it's in ad.Next()loop. Switches toAddfromSetwhich will append the value (even if it's empty) instead of overwriting every time.Also, turns out that
Addon headers will work even if there's nothing there yet (because it's initialized already as an empty array), so we can remove the condition I introduced in #3832 (effectively we just switched fromSettoAdd)