commit 10db2d12cfa8602d0ffa73c5c2270ce47ba56b30
author peter zhang <i@ddatsh.com> Mon Feb 26 18:23:26 2018 +0000
committer Brad Fitzpatrick <bradfitz@golang.org> Mon Feb 26 18:43:58 2018 +0000
tree 21972d9eae6fed1d8da35979fa62bd55ca09523b
parent 2ae76fd1560b622911f444c1e66b70a857e1de67

cmd/present: support being reverse proxied from https

Fixes golang/go#21921

Change-Id: Idc6ff2773dcef7210ce4d0eecb7affb357a213b5
GitHub-Last-Rev: 50b959e9b6f2f1513235c5ca0124d80b487c5296
GitHub-Pull-Request: golang/tools#26
Reviewed-on: https://go-review.googlesource.com/96295
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>

godoc/static/playground.js

diff --git a/godoc/static/playground.js b/godoc/static/playground.js
index 51b00a4..e8242a0 100644
--- a/godoc/static/playground.js
+++ b/godoc/static/playground.js
@@ -118,7 +118,12 @@
 	var id = 0;
 	var outputs = {};
 	var started = {};
-	var websocket = new WebSocket('ws://' + window.location.host + '/socket');
+	var websocket;
+	if (window.location.protocol == "http:") {
+		websocket = new WebSocket('ws://' + window.location.host + '/socket');
+	} else if (window.location.protocol == "https:") {
+		websocket = new WebSocket('wss://' + window.location.host + '/socket');
+	}
 
 	websocket.onclose = function() {
 		console.log('websocket connection closed');

godoc/static/static.go

diff --git a/godoc/static/static.go b/godoc/static/static.go
index 14739d8..d450f47 100644
--- a/godoc/static/static.go
+++ b/godoc/static/static.go
@@ -2314,7 +2314,12 @@
 	var id = 0;
 	var outputs = {};
 	var started = {};
-	var websocket = new WebSocket('ws://' + window.location.host + '/socket');
+	var websocket;
+	if (window.location.protocol == "http:") {
+		websocket = new WebSocket('ws://' + window.location.host + '/socket');
+	} else if (window.location.protocol == "https:") {
+		websocket = new WebSocket('wss://' + window.location.host + '/socket');
+	}
 
 	websocket.onclose = function() {
 		console.log('websocket connection closed');