Fast and extensible multi-platform HTTP/1-2-3 web server with automatic HTTPS
Mirrored from https://github.com/Slazee/caddy.git
Synced Nov 12, 03:15 UTC
caddytls: Fix broken refactor
Not sure how that happened...
Matthew Holt committed
Mar 6, 2025 at 08:54 UTC
bc3d497739444a5ce550696b7b0da36e6e3bc777
3 files changed
+3
-3
caddyconfig/httpcaddyfile/options.go
+1
-1
@@ -585,7 +585,7 @@ func parseOptECH(d *caddyfile.Dispenser, _ any) (any, error) {
585
publicNames := d.RemainingArgs()
586
for _, publicName := range publicNames {
587
ech.Configs = append(ech.Configs, caddytls.ECHConfiguration{
588
- OuterSNI: publicName,
588
+ PublicName: publicName,
589
})
590
}
591
if len(ech.Configs) == 0 {
caddyconfig/httpcaddyfile/tlsapp.go
+1
-1
@@ -375,7 +375,7 @@ func (st ServerType) buildTLSApp(
375
return nil, warnings, err
376
}
377
for _, cfg := range ech.Configs {
378
- ap.SubjectsRaw = append(ap.SubjectsRaw, cfg.OuterSNI)
378
+ ap.SubjectsRaw = append(ap.SubjectsRaw, cfg.PublicName)
379
}
380
if tlsApp.Automation == nil {
381
tlsApp.Automation = new(caddytls.AutomationConfig)
modules/caddytls/ech.go
+1
-1
@@ -136,7 +136,7 @@ func (ech *ECH) Provision(ctx caddy.Context) ([]string, error) {
136
// current/active, so they can be used for ECH retries
137
138
for _, cfg := range ech.Configs {
139
- publicName := strings.ToLower(strings.TrimSpace(cfg.OuterSNI))
139
+ publicName := strings.ToLower(strings.TrimSpace(cfg.PublicName))
140
141
if list, ok := ech.configs[publicName]; ok && len(list) > 0 {
142
// at least one config with this public name was loaded, so find the