Revert "Use TLS. Now the websocket should be accessed with wss:// protocol"

facchinm · facchinm · commit fca95cc04b9f · 2015-06-10T15:29:50.000+02:00
This reverts commit dc1b2fd [formerly d8fd00498d8a02c0480946d343bfd334ff50d6ad] [formerly 190f7fb80a8a583b6b3deaba63806d7185e66a92 [formerly 17236b48fac21ea2705a50e444d1088d0d710b2c]]. Chrome devs are quite strict with their policies :) Former-commit-id: 080eef329482862ea6077e8dddf90ff4f11d8efb [formerly 87239036599ee90a3cbeedbd7ab1b4b893cce7ed] Former-commit-id: 7405c9e0d0ecba65c4e1c3ac0f36eff8bfecb305
diff --git a/home.html b/home.html
@@ -1,7 +1,7 @@
 <html>
 <head>
 <title>Serial Port Example</title>
-<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
+<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
 <script type="text/javascript">
     $(function() {
 
@@ -31,7 +31,7 @@
     });
 
     if (window["WebSocket"]) {
-        conn = new WebSocket("wss://{{$}}/ws");
+        conn = new WebSocket("ws://{{$}}/ws");
         conn.onclose = function(evt) {
             appendLog($("<div><b>Connection closed.</b></div>"))
         }
diff --git a/main.go b/main.go
@@ -202,7 +202,7 @@ func main() {
 			http.HandleFunc("/", homeHandler)
 			http.HandleFunc("/ws", wsHandler)
 			http.HandleFunc("/upload", uploadHandler)
-			if err := http.ListenAndServeTLS(*addr, "cert.pem", "key.pem", nil); err != nil {
+			if err := http.ListenAndServe(*addr, nil); err != nil {
 				fmt.Printf("Error trying to bind to port: %v, so exiting...", err)
 				log.Fatal("Error ListenAndServe:", err)
 			}
@@ -264,7 +264,7 @@ const homeTemplateHtml = `<!DOCTYPE html>
 <html>
 <head>
 <title>Serial Port Example</title>
-<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
+<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
 <script type="text/javascript">
     $(function() {
 
@@ -294,7 +294,7 @@ const homeTemplateHtml = `<!DOCTYPE html>
     });
 
     if (window["WebSocket"]) {
-        conn = new WebSocket("wss://{{$}}/ws");
+        conn = new WebSocket("ws://{{$}}/ws");
         conn.onclose = function(evt) {
             appendLog($("<div><b>Connection closed.</b></div>"))
         }
