X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Fspush%2Fbrisk-spush.php;h=d39ba04e5236b6600b8e3bb8ec3a5449da3f0428;hb=192dfc6558fbebf34ebda89218ca1418c1858f00;hp=a811a2902f3283c58aa616cac8380084a405a4ca;hpb=8c1df4ebf55f715144a422cdb4be7eee48f1b5d2;p=brisk.git

diff --git a/web/spush/brisk-spush.php b/web/spush/brisk-spush.php
index a811a29..d39ba04 100755
--- a/web/spush/brisk-spush.php
+++ b/web/spush/brisk-spush.php
@@ -23,8 +23,11 @@
  *
  * TODO
  *
- *   - partial write for normal page management
- *   - log legal address fix
+ *   - BUG: logout failed
+ *   - BUG: fast loop on stream index_rd_ifra page
+ *
+ *   - garbage management
+ *   - log_legal address fix
  *   - from room to table
  *   - from table to room
  *   - fwrite other issues
@@ -35,6 +38,8 @@
  *
  *   DONE/FROZEN - problema con getpeer (HOSTADDR)
  *
+ *   DONE - bug: read from a not resource handle (already closed because a new socket substitute it)
+ *   DONE - partial write for normal page management
  *   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
@@ -221,28 +226,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
@@ -254,9 +262,18 @@ 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);
+                                $content_l = mb_strlen($content, "ASCII");
+
+                                $wret = @fwrite($new_socket, headers_render($header_out).$content);
+                                if ($wret < $content_l) {
+                                    printf("TROUBLES WITH FWRITE: %d\n", $ret);
+                                    $user->rd_cache_set(mb_substr($content, $ret, $content_l - $ret, "ASCII"));
+                                }
+                                else {
+                                    $user->rd_cache_set("");
+                                }
                                 fflush($new_socket);
 
                                 $s2u[intval($new_socket)] = $idx;
@@ -327,21 +344,21 @@ 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);
+                $content = $user->rd_cache_get();
+                if ($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 ($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 ($content != "") {
+                    echo "SPIA: [".substr($content, 0, 60)."...]\n";
+                    $content_l = mb_strlen($content, "ASCII");
+                    $wret = @fwrite($sock, $content);
+                    if ($wret < $content_l) {
+                        printf("TROUBLE WITH FWRITE: %d\n", $wret);
+                        $user->rd_cache_set(mb_substr($content, $wret, $content_l - $wret, "ASCII"));
                     }
                     else {
                         $user->rd_cache_set("");