caddy/caddyconfig
bwisn 7bc6e165b0
httpcaddyfile: preserve automation policy precedence when merging (#8287)
* httpcaddyfile: Don't merge automation policies if it would shadow another

Signed-off-by: Bartlomiej Wisniowski <56162793+bwisn@users.noreply.github.com>

* httpcaddyfile: add reverse case for shadowing merge, use force_automate to match the real life usage and explain why we're not checking the inverse

Signed-off-by: Bartlomiej Wisniowski <56162793+bwisn@users.noreply.github.com>

* httpcaddyfile: Check overlap in both directions when merging policies

Signed-off-by: Bartlomiej Wisniowski <56162793+bwisn@users.noreply.github.com>

---------

Signed-off-by: Bartlomiej Wisniowski <56162793+bwisn@users.noreply.github.com>
(cherry picked from commit eb04ed52be)
2026-11-03 00:53:50 -05:00
..
caddyfile caddyfile: check heredoc markers without a regexp (#8249) 2026-11-03 00:53:19 -05:00
httpcaddyfile httpcaddyfile: preserve automation policy precedence when merging (#8287) 2026-11-03 00:53:50 -05:00
warning admin: fix warnings and status code in /load API (#7267) 2026-09-23 08:55:38 -06:00
configadapters.go admin: fix warnings and status code in /load API (#7267) 2026-09-23 08:55:38 -06:00
httploader.go caddyconfig: cancel HTTP loader requests with context (#7918) 2026-08-10 15:12:47 +10:00
httploader_test.go caddyconfig: cancel HTTP loader requests with context (#7918) 2026-08-10 15:12:47 +10:00
load.go admin: fix warnings and status code in /load API (#7267) 2026-09-23 08:55:38 -06:00