Merge pull request #2777 from porter-dev/stefanmcshane-patch-2

Websocket patch

api/server/shared/config/loader/loader.go

@@ -206,27 +206,27 @@ func (e *EnvConfigLoader) LoadConfig() (res *config.Config, err error) {
 				origin := r.Header.Get("Origin")
 
 				// check if the server url is localhost, and allow all localhost origins
-				serverParsed, err := url.Parse(sc.ServerURL)
-				if err != nil {
-					return false
-				}
-				host, _, err := net.SplitHostPort(serverParsed.Host)
-				if err != nil {
-					return false
-				}
-				if host == "localhost" {
-					parsedOrigin, err := url.Parse(origin)
-					if err != nil {
-						return false
-					}
-					originHost, _, err := net.SplitHostPort(parsedOrigin.Host)
-					if err != nil {
-						return false
-					}
-					if originHost == "localhost" {
-						return true
-					}
-				}
+				//serverParsed, err := url.Parse(sc.ServerURL)
+				//if err != nil {
+					//return false
+				//}
+				//host, _, err := net.SplitHostPort(serverParsed.Host)
+				//if err != nil {
+					//return false
+				//}
+				//if host == "localhost" {
+					//parsedOrigin, err := url.Parse(origin)
+					//if err != nil {
+						//return false
+					//}
+					//originHost, _, err := net.SplitHostPort(parsedOrigin.Host)
+					//if err != nil {
+						//return false
+					//}
+					//if originHost == "localhost" {
+						//return true
+					//}
+				//}
 				return origin == sc.ServerURL
 			},
 		},