add websocketsec protocol as default for Brisk

diff --git a/WARNING.txt b/WARNING.txt
index a15fc68..edd81bc 100644 (file)
--- a/WARNING.txt
+++ b/WARNING.txt
@@ -2,10 +2,12 @@ APACHE2 CONFIGURATION IS CHANGED ! THIS IS A SAMPLE:
 
 ProxyPassMatch ^/brisk/.*\.(png|gif|jpg|css|js)$ !
     ProxyPass /brisk/briskin5/index_rd.php fd:///var/www/brisk-priv/brisk.sock keepalive=Off connectiontimeout=5 timeout=30
+    ProxyPass /brisk/briskin5/index_rd_wss.php fd:///var/www/brisk-priv/brisk.sock keepalive=Off connectiontimeout=5 timeout=30
     ProxyPass /brisk/briskin5/index_wr.php fd:///var/www/brisk-priv/brisk.sock keepalive=Off connectiontimeout=5 timeout=30
     ProxyPass /brisk/briskin5/briskin5/index.php fd:///var/www/brisk-priv/brisk.sock keepalive=Off connectiontimeout=5 timeout=30
     ProxyPass /brisk/briskin5/index.php fd:///var/www/brisk-priv/brisk.sock keepalive=Off connectiontimeout=5 timeout=30
     ProxyPass /brisk/index_rd.php fd:///var/www/brisk-priv/brisk.sock keepalive=Off connectiontimeout=5 timeout=30
+    ProxyPass /brisk/index_rd_wss.php fd:///var/www/brisk-priv/brisk.sock keepalive=Off connectiontimeout=5 timeout=30
     ProxyPass /brisk/index_wr.php fd:///var/www/brisk-priv/brisk.sock keepalive=Off connectiontimeout=5 timeout=30
     ProxyPass /brisk/index.php fd:///var/www/brisk-priv/brisk.sock keepalive=Off connectiontimeout=5 timeout=30
 --------

diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index 3a3d576..45e5fd1 100644 (file)
--- a/web/Obj/brisk.phh
+++ b/web/Obj/brisk.phh
@@ -2728,9 +2728,10 @@ class Brisk
 
           break;
       case "index_rd.php":
+      case "index_rd_wss.php":
           if (($transp  = gpcs_var('transp', $get, $post, $cookie)) === FALSE)
               $transp = "iframe";
-          if ($transp == 'websocket')
+          if ($transp == 'websocket' || $transp == 'websocketsec')
               $enc = 'plain';
 
           do {

diff --git a/web/briskin5/Obj/briskin5.phh b/web/briskin5/Obj/briskin5.phh
index e2cffa9..a058ad0 100644 (file)
--- a/web/briskin5/Obj/briskin5.phh
+++ b/web/briskin5/Obj/briskin5.phh
@@ -1507,9 +1507,10 @@ class Bin5 {
 
             break;
         case "index_rd.php":
+        case "index_rd_wss.php":
             if (($transp  = gpcs_var('transp', $get, $post, $cookie)) === FALSE)
                 $transp = "iframe";
-            if ($transp == 'websocket')
+            if ($transp == 'websocket' || $transp == 'websocketsec')
                 $enc = 'plain';
 
             do {

diff --git a/web/xynt-streaming.js b/web/xynt-streaming.js
index 788a783..3db25a1 100644 (file)
--- a/web/xynt-streaming.js
+++ b/web/xynt-streaming.js
@@ -631,8 +631,9 @@ xynt_streaming.prototype = {
         // page arrangement
         this.page = url_complete(this.win.location.href, this.page);
 
+        // DEFAULT TRANSPORT PROTOCOL HERE websocketsec, websocket
         if (this.transp_fback > 0) {
-            transp_type = "websocket";
+            transp_type = "websocketsec";
             transp_port = (this.transp_fback == 2 ? 80 : 8080);
         }
         else {