From 10db2d12cfa8602d0ffa73c5c2270ce47ba56b30 Mon Sep 17 00:00:00 2001 From: peter zhang Date: Mon, 26 Feb 2018 18:23:26 +0000 Subject: [PATCH] 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 --- godoc/static/playground.js | 7 ++++++- godoc/static/static.go | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/godoc/static/playground.js b/godoc/static/playground.js index 51b00a43..e8242a08 100644 --- a/godoc/static/playground.js +++ b/godoc/static/playground.js @@ -118,7 +118,12 @@ function SocketTransport() { 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'); diff --git a/godoc/static/static.go b/godoc/static/static.go index 14739d80..d450f472 100644 --- a/godoc/static/static.go +++ b/godoc/static/static.go @@ -2314,7 +2314,12 @@ function SocketTransport() { 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');