index_wr.php management sanitized

[brisk.git] / web / spush / brisk-spush.php

diff --git a/web/spush/brisk-spush.php b/web/spush/brisk-spush.php
index 9593450..28088f3 100755 (executable)
--- 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
@@ -173,6 +178,11 @@ function main()
             }
             /* At least at one of the sockets something interesting happened */
             foreach ($read as $i => $sock) {
+                /* is_resource check is required because there is the possibility that
+                   during new request an old connection is closed */
+                if (!is_resource($sock)) {
+                    continue;
+                }
                 if ($sock === $list) {
                     printf("NUOVA CONNEX\n");
                     $new_unix = stream_socket_accept($list);
@@ -216,18 +226,17 @@ 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 {