Fix crash on SSL connections

essen · essen · commit 17b332f23225 · 2016-01-12T17:40:00.000+01:00
Also fixes the example for SSL.
diff --git a/priv/example/index.html b/priv/example/index.html
@@ -3,7 +3,7 @@
   <head>
   <meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
   <title>RabbitMQ Web MQTT Example</title>
-  <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
+  <script src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
   <script src="mqttws31.js" type="text/javascript"></script>
   <style>
       .box {
@@ -90,8 +90,8 @@ <h2>Logs</h2>
 
         var debug = pipe('#second');
 
-        var wsbroker = "localhost";  //mqtt websocket enabled broker
-        var wsport = 15675 // port for above
+        var wsbroker = location.hostname;  //mqtt websocket enabled broker
+        var wsport = parseInt(location.port) // port for above
 
         var client = new Paho.MQTT.Client(wsbroker, wsport, "/ws",
             "myclientid_" + parseInt(Math.random() * 100, 10));
@@ -116,6 +116,10 @@ <h2>Logs</h2>
             }
         };
 
+        if (location.protocol == "https:") {
+            options.useSSL = true;
+        }
+
         debug("CONNECT TO " + wsbroker + ":" + wsport);
         client.connect(options);
 
diff --git a/src/rabbit_web_mqtt_app.erl b/src/rabbit_web_mqtt_app.erl
@@ -69,9 +69,10 @@ mqtt_init() ->
     case get_env(ssl_config, []) of
         [] ->
             ok;
-        SSLConf ->
+        SSLConf0 ->
             rabbit_networking:ensure_ssl(),
-            SSLPort = proplists:get_value(port, SSLConf),
+            SSLPort = proplists:get_value(port, SSLConf0),
+            SSLConf = [{connection_type, supervisor}|SSLConf0],
 
             {ok, _} = ranch:start_listener(web_mqtt_secure, get_env(num_ssl_acceptors, 1),
                 ranch_ssl, SSLConf,
