X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;ds=inline;f=web%2FObj%2Fuser.phh;h=1fc59a24f5085d007549dfe554349545d4c1bfa1;hb=43cab39ea58529cd2442c28f4157bb7efc97856f;hp=924047464a0dc68d54c8785d47eb9806b29289b0;hpb=22d0d66d55607bc8941922fc1bf4d818664abbc2;p=brisk.git
diff --git a/web/Obj/user.phh b/web/Obj/user.phh
index 9240474..1fc59a2 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;
@@ -710,7 +710,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 +822,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 +944,23 @@ push(\"%s\");
return TRUE;
}
-function stream_keepalive()
+function stream_keepalive($with_ping)
{
- return (sprintf("", $this->rd_scristp++));
-
+", $this->rd_scristp++, ($with_ping ? "\"act_ping();\"" : "null")));
+
+ return ($ret);
}
-function stream_ping()
+static function base_get()
{
- return (sprintf("", $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