X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=web%2Fspush%2Fbrisk-spush.php;h=95934501565457ddf1e101c22a8685887a5c2ff5;hb=92c5ac9505608504a33b757a2f0f1c1a0fcd86ad;hp=068d46c0dc31c5d5cc41ff520c36b444ea7e3357;hpb=a83f493a328cfcb04ab53c5e5f08a530a9b5f290;p=brisk.git

diff --git a/web/spush/brisk-spush.php b/web/spush/brisk-spush.php
index 068d46c..9593450 100755
--- a/web/spush/brisk-spush.php
+++ b/web/spush/brisk-spush.php
@@ -22,16 +22,25 @@
  * Suite 330, Boston, MA 02111-1307, USA.
  *
  * TODO
- *   index_wr.php::chat
- *   index_wr.php::reload
- *   index_wr.php::exit
  *
- *   setcookie (for tables only)
- *   keepalive
- *   chunked 
- *   BUG - after restart index_rd.php receive from prev clients a lot of req
+ *   - partial write for normal page management
+ *   - log legal address fix
+ *   - from room to table
+ *   - from table to room
+ *   - fwrite other issues
+ *   - manage and test cross forwarder between table and room
+ *   - setcookie (for tables only)
+ *   - keepalive management
+ *   - chunked
+ *
  *   DONE/FROZEN - problema con getpeer (HOSTADDR)
  *
+ *   DONE - index_rd_ifra: last_clean issue
+ *   DONE - fwrite failed error management (select, buffer where store unsent data, and fwrite check and retry)
+ *   ABRT - index_wr.php::reload - reload is js-only function
+ *   DONE - bug: after restart index_rd.php receive from prev clients a lot of req
+ *   DONE - index_wr.php::chat
+ *   DONE - index_wr.php::exit
  *   DONE - index_rd.php porting
  *   DONE - generic var management from internet
  *   DONE - index.php auth part
@@ -113,6 +122,7 @@ function main()
     }
 
     $s2u  = array();
+    $pages_flush = array();
 
     $rndstr = "";
     for ($i = 0 ; $i < 4096 ; $i++) {
@@ -137,7 +147,7 @@ function main()
 
     while ($main_loop) {
         $curtime = time();
-        printf("IN LOOP: Current opened: %d\n", count($socks));
+        printf("IN LOOP: Current opened: %d  pages_flush: %d\n", count($socks), count($pages_flush));
 
         /* Prepare the read array */
         if ($shutdown) 
@@ -195,9 +205,14 @@ function main()
                             index_main($room, $header_out, $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_wr.php":
                             $header_out = array();
@@ -297,6 +312,13 @@ function main()
             }
         }
 
+
+        foreach ($pages_flush as $k => $pgflush) {
+            if ($pgflush->try_flush($curtime) == TRUE) {
+                unset($pages_flush[$k]);
+            }
+        }
+
         foreach ($socks as $k => $sock) {
             if (isset($s2u[intval($sock)])) {
                 $user = $room->user[$s2u[intval($sock)]];
@@ -310,11 +332,11 @@ function main()
 
                 if ($body != "") {
                     echo "SPIA: [".substr($body, 0, 60)."...]\n";
-                    $body_l = mb_strlen($body, "LATIN1");
+                    $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, "LATIN1"));
+                        $user->rd_cache_set(mb_substr($body, $ret, $body_l - $ret, "ASCII"));
                     }
                     else {
                         $user->rd_cache_set("");