From 8095657735b66e43c160c1ec5289ba1813183d44 Mon Sep 17 00:00:00 2001
From: Leo Balduf <baldufle@hu-berlin.de>
Date: Tue, 4 Sep 2018 12:45:06 +0200
Subject: [PATCH] http: fix TLS

---
 frontend/http/frontend.go | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/frontend/http/frontend.go b/frontend/http/frontend.go
index 3cf553f..ffd5ea6 100644
--- a/frontend/http/frontend.go
+++ b/frontend/http/frontend.go
@@ -164,8 +164,16 @@ func (f *Frontend) listenAndServe() error {
 	f.srv.SetKeepAlivesEnabled(false)
 
 	// Start the HTTP server.
-	if err := f.srv.ListenAndServe(); err != http.ErrServerClosed {
-		return err
+	if f.tlsCfg != nil {
+		// ... using TLS.
+		if err := f.srv.ListenAndServeTLS("", ""); err != http.ErrServerClosed {
+			return err
+		}
+	} else {
+		// ... using plain TCP.
+		if err := f.srv.ListenAndServe(); err != http.ErrServerClosed {
+			return err
+		}
 	}
 
 	return nil