OrgGo
/
caddy
mirror of https://github.com/caddyserver/caddy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

httpcaddyfile: Fix nil pointer dereference

This commit is contained in:
Matthew Holt 2019-09-18 10:51:49 -06:00
parent bc9f944837
commit 39d61cad2d
No known key found for this signature in database
GPG Key ID: 2A349DD577D586A5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
caddyconfig/httpcaddyfile/httptype.go
View File

@ -266,9 +266,9 @@ func (st *ServerType) serversFromPairings(
if err != nil {
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
if srv.AutoHTTPS == nil && len(autoHTTPSQualifiedHosts) > 0 {
if srv.AutoHTTPS == nil {
srv.AutoHTTPS = new(caddyhttp.AutoHTTPSConfig)
}
srv.AutoHTTPS.Skip = append(srv.AutoHTTPS.Skip, autoHTTPSQualifiedHosts...)