mirrors
/
AdGuardHome
mirror of https://github.com/AdguardTeam/AdGuardHome.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix inability to start https server if it wasn't running

This commit is contained in:
Eugene Bujak 2019-02-19 19:08:34 +03:00
parent 77793e5f21
commit e873149bee
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
control.go
View File

@ -1101,10 +1101,12 @@ func handleTLSConfigure(w http.ResponseWriter, r *http.Request) {
marshalTLS(w, data) marshalTLS(w, data)
// this needs to be done in a goroutine because Shutdown() is a blocking call, and it will block // this needs to be done in a goroutine because Shutdown() is a blocking call, and it will block
// until all requests are finished, and _we_ are inside a request right now, so it will block indefinitely // until all requests are finished, and _we_ are inside a request right now, so it will block indefinitely
if restartHTTPS && httpsServer.server != nil { if restartHTTPS {
go func() { go func() {
httpsServer.cond.Broadcast() httpsServer.cond.Broadcast()
httpsServer.server.Shutdown(context.TODO()) if httpsServer.server != nil {
httpsServer.server.Shutdown(context.TODO())
}
}() }()
} }
} }