X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fsac-a-push.phh;h=cd0d6abb81bd0dc67a4795876e9d90fca90ac431;hb=2a82f64f7c99c99b0c38fa2911ddfda0b6609ae7;hp=bdb4b593c82b50241498a94b572fb9705a02342b;hpb=10aaf5871fe0fec286715d1799ccaa1cd018acf0;p=brisk.git

diff --git a/web/Obj/sac-a-push.phh b/web/Obj/sac-a-push.phh
index bdb4b59..cd0d6ab 100644
--- a/web/Obj/sac-a-push.phh
+++ b/web/Obj/sac-a-push.phh
@@ -24,6 +24,7 @@
  */
 
 define('SITE_PREFIX', '/brisk/');
+define('SITE_PREFIX_LEN', 7);
 
 function spu_process_info($stream_info, $method, &$header, &$get, &$post, &$cookie)
 {
@@ -326,7 +327,16 @@ class Sac_a_push {
                             $addr = stream_socket_get_name($new_socket, TRUE);
                             $header_out = array();
 
-                            $this->app->request_mgr($this, $header_out, $new_socket, $path, $addr, $get, $post, $cookie);
+                            $subs = SITE_PREFIX."briskin5/";
+                            $subs_l = strlen($subs);
+                            $rret = FALSE;
+                            if (!strncmp($path, SITE_PREFIX, SITE_PREFIX_LEN)) {
+                                $rret = $this->app->request_mgr($this, $header_out, $new_socket, substr($path, SITE_PREFIX_LEN), $addr, $get, $post, $cookie);
+                            }
+                            if ($rret == FALSE) { 
+                                // FIXME: manage 404 !!!
+                                printf("TODO: fix unknown page\n");
+                            }
                             printf("number of sockets after %d\n", count($this->socks));
                         }
                         else {
@@ -336,7 +346,6 @@ class Sac_a_push {
                     else {
                         if (($buf = fread($sock, 512)) === FALSE) {
                             printf("error read\n");
-                            exit(123);
                         }
                         else if (strlen($buf) === 0) {
                             if ($sock === $this->list) {
@@ -361,7 +370,7 @@ class Sac_a_push {
                             }
                         }
                         else {
-                            if ($debug > 1) {
+                            if ($this->debug > 1) {
                                 print_r($read);
                             }
                             if ($sock === $this->list) {
@@ -380,6 +389,9 @@ class Sac_a_push {
             }
             
 
+            $this->app->garbage_manager(FALSE);
+
+
             /* manage unfinished pages */
             foreach ($this->pages_flush as $k => $pgflush) {
                 if ($pgflush->try_flush($this->curtime) == TRUE) {
@@ -392,10 +404,18 @@ class Sac_a_push {
                 if (isset($this->s2u[intval($sock)])) {
                     $user = $this->s2u[intval($sock)];
                     $response = $user->rd_cache_get();
+                    if (($this->curtime - $user->lacc) <= (EXPIRE_TIME_RD / 2)) {
+                        $user->ping_req = FALSE;
+                    }
                     if ($response == "") {
                         $content = "";
                         $user->stream_main($content, $get, $post, $cookie);
-                        
+                        printf("[%s] [%d] [%d]\n", $user->name, $user->lacc, $this->curtime);
+                        if ($content == "" && $user->ping_req == FALSE 
+                            && (($this->curtime - $user->lacc) > (EXPIRE_TIME_RD / 2))) {
+                            $content = $user->stream_ping();
+                            $user->ping_req = TRUE;
+                        }
                         if ($content == "" && $user->rd_kalive_is_expired($this->curtime)) {
                             $content = $user->stream_keepalive();
                         }
@@ -405,7 +425,8 @@ class Sac_a_push {
                     }
                     
                     if ($response != "") {
-                        echo "SPIA: [".substr($response, 0, 60)."...]\n";
+                        // echo "SPIA: [".substr($response, 0, 60)."...]\n";
+                        echo "SPIA: [".$response."...]\n";
                         $response_l = mb_strlen($response, "ASCII");
                         $wret = @fwrite($sock, $response);
                         if ($wret < $response_l) {