Matthew Holt
5 years ago
No known key found for this signature in database
GPG Key ID: 2A349DD577D586A5
1 changed files with
2 additions and
2 deletions
-
caddyconfig/httpcaddyfile/httptype.go
|
@ -266,9 +266,9 @@ func (st *ServerType) serversFromPairings( |
|
|
if err != nil { |
|
|
if err != nil { |
|
|
return nil, err |
|
|
return nil, err |
|
|
} |
|
|
} |
|
|
if _, ok := sblock.pile["tls.off"]; ok { |
|
|
if _, ok := sblock.pile["tls.off"]; ok && len(autoHTTPSQualifiedHosts) > 0 { |
|
|
// tls off: disable TLS (and automatic HTTPS) for server block's names
|
|
|
// tls off: disable TLS (and automatic HTTPS) for server block's names
|
|
|
if srv.AutoHTTPS == nil && len(autoHTTPSQualifiedHosts) > 0 { |
|
|
if srv.AutoHTTPS == nil { |
|
|
srv.AutoHTTPS = new(caddyhttp.AutoHTTPSConfig) |
|
|
srv.AutoHTTPS = new(caddyhttp.AutoHTTPSConfig) |
|
|
} |
|
|
} |
|
|
srv.AutoHTTPS.Skip = append(srv.AutoHTTPS.Skip, autoHTTPSQualifiedHosts...) |
|
|
srv.AutoHTTPS.Skip = append(srv.AutoHTTPS.Skip, autoHTTPSQualifiedHosts...) |
|
|