X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Fspush%2Fbrisk-spush.php;h=2717b5265f2acc8eb113efee1eb4b37f8080d0da;hb=5c7f81c55f00cc968162449eae3e799f160bfdcf;hp=2e2f8128f427ee37f9d12a205a61875040e10677;hpb=f1823e80a828e054479dd5ab50e4d02e967f37f3;p=brisk.git

diff --git a/web/spush/brisk-spush.php b/web/spush/brisk-spush.php
index 2e2f812..2717b52 100755
--- a/web/spush/brisk-spush.php
+++ b/web/spush/brisk-spush.php
@@ -23,6 +23,8 @@
  *
  * TODO
  *
+ *   WIP - chunked
+ *
  *   - BUG: logout failed
  *   - BUG: fast loop on stream index_rd_ifra page
  *
@@ -34,7 +36,6 @@
  *   - manage and test cross forwarder between table and room
  *   - setcookie (for tables only)
  *   - keepalive management
- *   - chunked
  *
  *   DONE/FROZEN - problema con getpeer (HOSTADDR)
  *
@@ -65,7 +66,7 @@ require_once($G_base."briskin5/Obj/briskin5.phh");
 
 define('SITE_PREFIX', '/brisk/');
 
-function headers_render($header)
+function headers_render($header, $len)
 {
     
     $s = "";
@@ -79,7 +80,15 @@ function headers_render($header)
     foreach($header as $key => $value) {
         $s .= sprintf("%s: %s\r\n", $key, $value);
     }
-    $s .= "Mop: was/here\r\n";
+    if ($len == -1) {
+        $s .= "Cache-Control: no-cache, must-revalidate\r\n";
+        $s .= "Expires: Mon, 26 Jul 1997 05:00:00 GMT\r\n";
+        $s .= "Content-Encoding: chunked\r\n";
+        $s .= "Transfer-Encoding: chunked\r\n";
+    }
+    else if ($len > 0) {
+        $s .= sprintf("Content-Length: %d\r\n", $len);
+    }
     $s .= "\r\n";
 
     return ($s);
@@ -103,6 +112,18 @@ register_shutdown_function('shutta');
  */
 $shutdown = FALSE;
 
+function chunked_content($content)
+{
+    $content_l = mb_strlen($content, "ASCII");
+
+    return (sprintf("%X\r\n%s\r\n", $content_l, $content));
+}
+
+function chunked_fini()
+{
+    return sprintf("0\r\n");
+}
+
 function main()
 {
     GLOBAL $G_headers;
@@ -226,28 +247,31 @@ function main()
                             break;
                         case SITE_PREFIX."index_wr.php":
                             $header_out = array();
-                            $addr = "";
-                            // $ret = socket_getpeername($new_socket, $addr);
-                            printf("RET: %s\n", $addr);
-                            // exit(123);
                             ob_start();
                             index_wr_main($room, $addr, $get, $post, $cookie);
                             $content = ob_get_contents();
                             ob_end_clean();
-                            
-                            // printf("OUT: [%s]\n", $G_content);
-                            fwrite($new_socket, headers_render($header_out).$content);
-                            fclose($new_socket);
+
+                            $pgflush = new PageFlush($new_socket, $curtime, 20, $header_out, $content);
+
+                            if ($pgflush->try_flush($curtime) == FALSE) {
+                                // Add $pgflush to the pgflush array
+                                array_push($pages_flush, $pgflush);
+                            }
                             break;
                         case SITE_PREFIX."index_rd_ifra.php":
                             do {
                                 $header_out = array();
                                 if (!isset($cookie['sess'])
                                     || (($user = $room->get_user($cookie['sess'], $idx)) == FALSE)) {
-                                    $body = index_rd_ifra_fini(TRUE);
-                                    fwrite($new_socket, headers_render($header_out).$body);
-                                    fflush($new_socket);
-                                    fclose($new_socket);
+                                    $content = index_rd_ifra_fini(TRUE);
+                                    
+                                    $pgflush = new PageFlush($new_socket, $curtime, 20, $header_out, $content);
+
+                                    if ($pgflush->try_flush($curtime) == FALSE) {
+                                        // Add $pgflush to the pgflush array
+                                        array_push($pages_flush, $pgflush);
+                                    }
                                     break;
                                 }
                                 // close a previous opened index_read_ifra socket, if exists
@@ -259,9 +283,20 @@ function main()
                                     $user->rd_socket_set(NULL);
                                 }
 
-                                $body = "";
-                                index_rd_ifra_init($room, $user, $header_out, $body, $get, $post, $cookie);
-                                fwrite($new_socket, headers_render($header_out).$body);
+                                $content = "";
+                                index_rd_ifra_init($room, $user, $header_out, $content, $get, $post, $cookie);
+
+                                $response = headers_render($header_out, -1).chunked_content($content);
+                                $response_l = mb_strlen($response, "ASCII");
+
+                                $wret = @fwrite($new_socket, $response, $response_l);
+                                if ($wret < $response_l) {
+                                    printf("TROUBLES WITH FWRITE: %d\n", $wret);
+                                    $user->rd_cache_set(mb_substr($content, $wret, $response_l - $wret, "ASCII"));
+                                }
+                                else {
+                                    $user->rd_cache_set("");
+                                }
                                 fflush($new_socket);
 
                                 $s2u[intval($new_socket)] = $idx;
@@ -332,21 +367,26 @@ function main()
         foreach ($socks as $k => $sock) {
             if (isset($s2u[intval($sock)])) {
                 $user = $room->user[$s2u[intval($sock)]];
-                $body = $user->rd_cache_get();
-                if ($body == "")
-                    index_rd_ifra_main($room, $user, $body);
+                $response = $user->rd_cache_get();
+                if ($response == "") {
+                    $content = "";
+                    index_rd_ifra_main($room, $user, $content);
 
-                if ($body == "" && $user->rd_kalive_is_expired($curtime)) {
-                    $body = index_rd_ifra_keepalive($user);
+                    if ($content == "" && $user->rd_kalive_is_expired($curtime)) {
+                        $content = index_rd_ifra_keepalive($user);
+                    }
+                    if ($content != "") {
+                        $response = chunked_content($content);
+                    }
                 }
 
-                if ($body != "") {
-                    echo "SPIA: [".substr($body, 0, 60)."...]\n";
-                    $body_l = mb_strlen($body, "ASCII");
-                    $ret = @fwrite($sock, $body);
-                    if ($ret < $body_l) {
-                        printf("TROUBLE WITH FWRITE: %d\n", $ret);
-                        $user->rd_cache_set(mb_substr($body, $ret, $body_l - $ret, "ASCII"));
+                if ($response != "") {
+                    echo "SPIA: [".substr($response, 0, 60)."...]\n";
+                    $response_l = mb_strlen($response, "ASCII");
+                    $wret = @fwrite($sock, $response);
+                    if ($wret < $response_l) {
+                        printf("TROUBLE WITH FWRITE: %d\n", $wret);
+                        $user->rd_cache_set(mb_substr($response, $wret, $response_l - $wret, "ASCII"));
                     }
                     else {
                         $user->rd_cache_set("");