X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fuser.phh;h=f99384831d2e172adc9fab5130e458ebff430658;hb=78c68fdf4027088a08b915982ae19a500d9a4e26;hp=924047464a0dc68d54c8785d47eb9806b29289b0;hpb=64fd2be16978dab5d777388423a9d1d74d620cf8;p=brisk.git

diff --git a/web/Obj/user.phh b/web/Obj/user.phh
index 9240474..f993848 100644
--- a/web/Obj/user.phh
+++ b/web/Obj/user.phh
@@ -637,7 +637,7 @@ class User {
 
   /* INDEX_RD_IFRA PORT */
 
-  static function blocking_error($is_unrecoverable)
+  protected function blocking_error($is_unrecoverable)
   {
       GLOBAL $is_page_streaming;
       
@@ -679,23 +679,6 @@ class User {
       $ret = FALSE;
       $curtime = time();
       
-      /* if ((($curtime - $this->lacc) >  STREAM_TIMEOUT) || Room::garbage_time_is_expired($curtime)) { */
-      /*     $S_load_stat['lL_laccgarb']++; */
-          
-      /*     if (($curtime - $this->lacc) >=  STREAM_TIMEOUT) { */
-      /*         $S_load_stat['wU_lacc_upd']++; */
-      /*         $this->lacc = $curtime; */
-      /*     } */
-          
-      /*     if (Room::garbage_time_is_expired($curtime)) { */
-      /*         log_only("F"); */
-              
-      /*         $S_load_stat['wR_garbage']++; */
-      /*         log_main("pre garbage_manager TRE"); */
-      /*         $this->room->garbage_manager(FALSE); */
-      /*     } */
-      /* } */
-      
       /* Nothing changed, return. */
       if ($cur_step == $this->step) 
           return (FALSE);
@@ -710,7 +693,7 @@ class User {
           $S_load_stat['wR_minusone']++;
           
           if ($this->the_end == TRUE) { 
-              log_rd2("main_check: the end".var_export(debug_backtrace()));
+              // log_rd2("main_check: the end".var_export(debug_backtrace()));
               $is_page_streaming = TRUE;
           }
           
@@ -822,7 +805,7 @@ class User {
       return ($ret);
   }  //   function maincheck (...
 
-static function stream_fini($is_unrecoverable)
+public static function stream_fini($is_unrecoverable)
 {
     GLOBAL $G_four_rnd_string;
 
@@ -944,31 +927,23 @@ push(\"%s\");
     return TRUE;
 }
 
-function stream_keepalive()
+function stream_keepalive($with_ping)
 {
-    return (sprintf("<script id='hs%d' type='text/javascript'><!--
-push(null);
+    $ret =  (sprintf("<script id='hs%d' type='text/javascript'><!--
+push(%s);
 // -->
-</script>", $this->rd_scristp++));
-    
+</script>", $this->rd_scristp++, ($with_ping ? "\"act_ping();\"" : "null")));
+
+    return ($ret);
 }
 
-function stream_ping()
+static function base_get()
 {
-    return (sprintf("<script id='hs%d' type='text/javascript'><!--
-push(\"act_ping();\");
-// -->
-</script>", $this->rd_scristp++));
-    
+    $c = get_called_class();
+    printf("CALLED_CLASS: [%s]\n", $c);
+    return $c::BASE;
 }
 
-    static function base_get()
-    {
-        $c = get_called_class();
-        printf("CALLED_CLASS: [%s]\n", $c);
-        return $c::BASE;
-    }
-
 } // end class User