add 'plain' encoding for websocket during the match too

[brisk.git] / web / briskin5 / Obj / briskin5.phh

diff --git a/web/briskin5/Obj/briskin5.phh b/web/briskin5/Obj/briskin5.phh
index 008d85c..8388df8 100644 (file)
--- a/web/briskin5/Obj/briskin5.phh
+++ b/web/briskin5/Obj/briskin5.phh
@@ -1153,6 +1153,8 @@ class Bin5 {
 
     static function request_mgr(&$s_a_p, $header, &$header_out, &$new_socket, $path, $addr, $get, $post, $cookie)
     {
+        GLOBAL $G_black_list;
+
         printf("NEW_SOCKET (root): %d\n", intval($new_socket));
         
         $enc = get_encoding($header);
@@ -1209,6 +1211,11 @@ class Bin5 {
             
             break;
         case "index_rd_ifra.php":
+            if (($transp  = gpcs_var('transp', $get, $post, $cookie)) === FALSE)
+                $transp = "iframe";
+            if ($transp == 'websocket')
+                $enc = 'plain';
+
             do {
                 if (!isset($table_idx)
                     || !isset($table_token)
@@ -1231,8 +1238,9 @@ class Bin5 {
                 }
                 
                 $content = "";
-                $user->stream_init($s_a_p->rndstr, $enc, $header_out, $content, $get, $post, $cookie);
-                $response = headers_render($header_out, -1).chunked_content($user->rd_zls_get(), $content);
+                $user->stream_init($s_a_p->rndstr, $enc, $header, $header_out, $content, $get, $post, $cookie);
+
+                $response = headers_render($header_out, -1).$user->chunked_content($content);
                 $response_l = mb_strlen($response, "ASCII");
                 
                 $wret = @fwrite($new_socket, $response, $response_l);