From 27695c2a3dab4dfac6723a7dae0d73beaa565541 Mon Sep 17 00:00:00 2001
From: Simon Eisenmann <simon@longsleep.org>
Date: Fri, 18 Apr 2014 20:43:46 +0200
Subject: [PATCH] Also start up the default HTTPS handler.

---
 .gitignore                                |  4 ++++
 src/app/spreed-speakfreely-server/main.go | 11 +++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index e6f51d70..651650c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,7 @@ vendor/*
 /.sass-cache
 /extra
 /src/i18n/*.mo
+server.key
+server.csr
+server.crt
+server.pem
diff --git a/src/app/spreed-speakfreely-server/main.go b/src/app/spreed-speakfreely-server/main.go
index 3eb8cc58..ecdbb333 100644
--- a/src/app/spreed-speakfreely-server/main.go
+++ b/src/app/spreed-speakfreely-server/main.go
@@ -121,7 +121,7 @@ func handleRoomView(room string, w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("Cache-Control", "private, max-age=0")
 
 	// Detect if the request was made with SSL.
-	ssl := false
+	ssl := r.TLS != nil
 	proto, ok := r.Header["X-Forwarded-Proto"]
 	if ok {
 		ssl = proto[0] == "https"
@@ -357,7 +357,14 @@ func runner(runtime phoenix.Runtime) error {
 		}
 	}
 
-	runtime.DefaultHTTPHandler(r)
+	err = runtime.DefaultHTTPHandler(r)
+	if err != nil {
+		log.Println("Failed to create HTTP handler", err)
+	}
+	err = runtime.DefaultHTTPSHandler(r)
+	if err != nil {
+		log.Println("Failed to create HTTPS handler", err)
+	}
 
 	return runtime.Start()
 }