Merge 'v1.7' into master

server/server.go

@@ -136,29 +136,35 @@ type serverEntryPoint struct {
 
 func (s serverEntryPoint) Shutdown(ctx context.Context) {
 	var wg sync.WaitGroup
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
-		if err := s.httpServer.Shutdown(ctx); err != nil {
-			if ctx.Err() == context.DeadlineExceeded {
-				log.Debugf("Wait server shutdown is over due to: %s", err)
-				err = s.httpServer.Close()
-				if err != nil {
-					log.Error(err)
+	if s.httpServer != nil {
+		wg.Add(1)
+		go func() {
+			defer wg.Done()
+			if err := s.httpServer.Shutdown(ctx); err != nil {
+				if ctx.Err() == context.DeadlineExceeded {
+					log.Debugf("Wait server shutdown is over due to: %s", err)
+					err = s.httpServer.Close()
+					if err != nil {
+						log.Error(err)
+					}
 				}
 			}
-		}
-	}()
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
-		if err := s.hijackConnectionTracker.Shutdown(ctx); err != nil {
-			if ctx.Err() == context.DeadlineExceeded {
-				log.Debugf("Wait hijack connection is over due to: %s", err)
-				s.hijackConnectionTracker.Close()
+		}()
+	}
+
+	if s.hijackConnectionTracker != nil {
+		wg.Add(1)
+		go func() {
+			defer wg.Done()
+			if err := s.hijackConnectionTracker.Shutdown(ctx); err != nil {
+				if ctx.Err() == context.DeadlineExceeded {
+					log.Debugf("Wait hijack connection is over due to: %s", err)
+					s.hijackConnectionTracker.Close()
+				}
 			}
-		}
-	}()
+		}()
+	}
+
 	wg.Wait()
 }
 

server/server_configuration.go

@@ -184,6 +184,11 @@ func (s *Server) loadFrontendConfig(
 				return nil, err
 			}
 
+			// Handler used by error pages
+			if backendsHandlers[entryPointName+providerName+frontend.Backend] == nil {
+				backendsHandlers[entryPointName+providerName+frontend.Backend] = lb
+			}
+
 			if healthCheckConfig != nil {
 				backendsHealthCheck[entryPointName+providerName+frontendHash] = healthCheckConfig
 			}