summaryrefslogtreecommitdiff
path: root/caddytest/integration/caddyfile_adapt
diff options
context:
space:
mode:
authorFrancis Lavoie <lavofr@gmail.com>2022-09-20 10:09:04 -0400
committerGitHub <noreply@github.com>2022-09-20 08:09:04 -0600
commit821a08a6e39ed0e7c43b0271ccf126c194eb6339 (patch)
tree3900e490a87626c50c3710e386cec8001aaf0813 /caddytest/integration/caddyfile_adapt
parente3d04ff86b5bf886bc4c6cf7806987eeda96d163 (diff)
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
Diffstat (limited to 'caddytest/integration/caddyfile_adapt')
-rw-r--r--caddytest/integration/caddyfile_adapt/global_server_options_single.txt2
1 files changed, 1 insertions, 1 deletions
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
}
}