From 821a08a6e39ed0e7c43b0271ccf126c194eb6339 Mon Sep 17 00:00:00 2001 From: Francis Lavoie Date: Tue, 20 Sep 2022 10:09:04 -0400 Subject: httpcaddyfile: Fix `protocols` global option parsing (#5054) * httpcaddyfile: Fix `protocols` global option parsing When checking for a block, the current nesting must be used, otherwise it returns the wrong thing. * Adjust adapt test to cover the broken behaviour that is now fixed * Fix some admin tests which suddenly run even with -short --- caddytest/integration/caddyfile_adapt/global_server_options_single.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'caddytest') diff --git a/caddytest/integration/caddyfile_adapt/global_server_options_single.txt b/caddytest/integration/caddyfile_adapt/global_server_options_single.txt index cfe6bfd..5fb6739 100644 --- a/caddytest/integration/caddyfile_adapt/global_server_options_single.txt +++ b/caddytest/integration/caddyfile_adapt/global_server_options_single.txt @@ -12,8 +12,8 @@ } max_header_size 100MB log_credentials - strict_sni_host protocols h1 h2 h2c h3 + strict_sni_host } } -- cgit v1.2.3