refactored exit management and add ghost_session class to manage welcome messages

[brisk.git] / web / Obj / sac-a-push.phh

diff --git a/web/Obj/sac-a-push.phh b/web/Obj/sac-a-push.phh
index 4e88985..6d75492 100644 (file)
--- a/web/Obj/sac-a-push.phh
+++ b/web/Obj/sac-a-push.phh
@@ -156,6 +156,8 @@ function spu_process_info($stream_info, &$method, &$header, &$get, &$post, &$coo
                 printf("A COUNT: [%s] %d\n", $a[0], count($a));
                 for ($i = 0 ; $i < count($a) ; $i++) {
                     $b = explode('=', $a[$i]);
+                    if ($b[0] == "")
+                        continue;
                     $get[$b[0]] = urldecode($b[1]);
                 }
             }
@@ -603,7 +605,7 @@ class Sac_a_push {
         foreach ($this->socks as $k => $sock) {
             $id = intval($sock);
             if (isset($this->s2u[$id])) {
-                if ($this->s2u[$id]->sess == '') {
+                if ($this->s2u[$id]->the_end) {
                     if ($this->s2u[$id]->rd_socket_get() != NULL) {
                         $this->s2u[$id]->rd_socket_set(NULL);
                     }
@@ -614,6 +616,7 @@ class Sac_a_push {
                 }
             }
         }
+        $this->app->users_cleanup();
     }
 
     function run()
@@ -796,7 +799,7 @@ class Sac_a_push {
                                 $line = trim($buf);
                                 if ($line == "reload") {
                                     require("$DOCUMENT_ROOT/Etc/".BRISK_CONF);
-                                    $this->app->reload($G_ban_list, $G_black_list);
+                                    $this->app->reload(FALSE, $G_ban_list, $G_black_list);
                                     global_dump();
                                 }
                                 else if ($line == "shutdown" || $line == "sd") {
@@ -874,6 +877,13 @@ class Sac_a_push {
                 $id = intval($sock);
                 if (isset($this->s2u[$id])) {
                     $user = $this->s2u[$id];
+
+                    if ($user->rd_toflush) {
+                        if (fflush($sock) == FALSE)
+                            continue;
+                        else
+                            $user->rd_toflush = FALSE;
+                    }
                     $response = $user->rd_cache_get();
                     $do_ping = FALSE;
                     if (($this->curtime - $user->lacc) > (EXPIRE_TIME_RD / 3)) {
@@ -911,7 +921,10 @@ class Sac_a_push {
                         else {
                             $user->rd_cache_set("");
                         }
-                        fflush($sock);
+                        if (fflush($sock) == FALSE) {
+                            $user->rd_toflush = TRUE;
+                            continue;
+                        }
                         $user->rd_kalive_reset($this->curtime);
                     }
                     
@@ -931,7 +944,9 @@ class Sac_a_push {
                 }  // if (isset($this->s2u[$id]...
             }  // foreach ($this->socks...
             printf("\n");
-            $this->app->cds->process();
+            if (defined('CURL_DE_SAC_VERS')) {
+                $this->app->cds->process();
+            }
         }  // while (...
     }  // function run(...