Merge pull request #470 from nightwing/patch-1

Allow running dev-server behind https proxy
webpack · May 15, 2016 · 7fc08e8 · 7fc08e8
2 parents 873d834 + 70bc376
commit 7fc08e8
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/client/index.js b/client/index.js
@@ -60,7 +60,7 @@ var onSocketMsg = {
 
 var newConnection = function() {
 	sock = new SockJS(url.format({
-		protocol: urlParts.protocol,
+		protocol: (window.location.protocol == "https:") ? "https:" : urlParts.protocol,
 		auth: urlParts.auth,
 		hostname: (urlParts.hostname === '0.0.0.0') ? window.location.hostname : urlParts.hostname,
 		port: (urlParts.port == '0') ? window.location.port : urlParts.port,