projects
/
brisk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
new class transport iframe decoupled from xynt_streaming to allow multiple transports
[brisk.git]
/
web
/
briskin5
/
index_rd.php
diff --git
a/web/briskin5/index_rd.php
b/web/briskin5/index_rd.php
index
aa8bfa9
..
0a66fc8
100644
(file)
--- a/
web/briskin5/index_rd.php
+++ b/
web/briskin5/index_rd.php
@@
-2,7
+2,7
@@
/*
* brisk - briskin5/index_rd.php
*
/*
* brisk - briskin5/index_rd.php
*
- * Copyright (C) 2006-201
1
Matteo Nastasi
+ * Copyright (C) 2006-201
2
Matteo Nastasi
* mailto: nastasi@alternativeoutput.it
* matteo.nastasi@milug.org
* web: http://www.alternativeoutput.it
* mailto: nastasi@alternativeoutput.it
* matteo.nastasi@milug.org
* web: http://www.alternativeoutput.it
@@
-64,7
+64,7
@@
function blocking_error($is_unrecoverable)
$is_page_streaming = TRUE;
log_rd2("BLOCKING_ERROR UNREC: ".($is_unrecoverable ? "TRUE" : "FALSE"));
$is_page_streaming = TRUE;
log_rd2("BLOCKING_ERROR UNREC: ".($is_unrecoverable ? "TRUE" : "FALSE"));
- return (sprintf(($is_unrecoverable ? '
the_end=true
; ' : '').'window.onbeforeunload = null; window.onunload = null; document.location.assign("../index.php");'));
+ return (sprintf(($is_unrecoverable ? '
xstm.stop()
; ' : '').'window.onbeforeunload = null; window.onunload = null; document.location.assign("../index.php");'));
}
function page_sync($sess, $page)
}
function page_sync($sess, $page)
@@
-73,7
+73,7
@@
function page_sync($sess, $page)
$is_page_streaming = TRUE;
log_rd2("PAGE_SYNC");
$is_page_streaming = TRUE;
log_rd2("PAGE_SYNC");
- return (sprintf('
the_end=true
; window.onbeforeunload = null; window.onunload = null; document.location.assign("%s");', $page));
+ return (sprintf('
xstm.stop()
; window.onbeforeunload = null; window.onunload = null; document.location.assign("%s");', $page));
}
function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_subst, &$new_step, $table_idx, $table_token)
}
function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_subst, &$new_step, $table_idx, $table_token)
@@
-100,7
+100,7
@@
function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
if (($sem = Bin5::lock_data(FALSE, $table_idx)) == FALSE) {
// wait 20 secs, then restart the xhr
ignore_user_abort(FALSE);
if (($sem = Bin5::lock_data(FALSE, $table_idx)) == FALSE) {
// wait 20 secs, then restart the xhr
ignore_user_abort(FALSE);
- return ("sleep(gst,20000);|x
hr_rd_abort(xhr_rd
);");
+ return ("sleep(gst,20000);|x
stm.xhr_abort(
);");
}
if (($user = Bin5_user::load_data($table_idx, $proxy_step['i'], $sess)) == FALSE) {
}
if (($user = Bin5_user::load_data($table_idx, $proxy_step['i'], $sess)) == FALSE) {
@@
-119,7
+119,7
@@
function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
if (($sem = Bin5::lock_data(TRUE, $table_idx)) == FALSE) {
// wait 20 secs, then restart the xhr
ignore_user_abort(FALSE);
if (($sem = Bin5::lock_data(TRUE, $table_idx)) == FALSE) {
// wait 20 secs, then restart the xhr
ignore_user_abort(FALSE);
- return ("sleep(gst,20000);|x
hr_rd_abort(xhr_rd
);");
+ return ("sleep(gst,20000);|x
stm.xhr_abort(
);");
}
$S_load_stat['lL_laccgarb']++;
}
$S_load_stat['lL_laccgarb']++;
@@
-196,7
+196,7
@@
function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
// else {
// ignore_user_abort(FALSE);
// else {
// ignore_user_abort(FALSE);
-// return ("sleep(gst,20000);|x
hr_rd_abort(xhr_rd
);");
+// return ("sleep(gst,20000);|x
stm.xhr_abort(
);");
// }
// $first_loop = FALSE;
// }
// $first_loop = FALSE;
@@
-337,7
+337,7
@@
function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
$new_step = $user->step;
} while (0);
$new_step = $user->step;
} while (0);
- log_
mop
($user->step, 'bin::index_rd.php: after ret set');
+ log_
rd2
($user->step, 'bin::index_rd.php: after ret set');
if ($user->the_end == TRUE) {
log_rd2("LOGOUT BYE BYE!!");
if ($user->the_end == TRUE) {
log_rd2("LOGOUT BYE BYE!!");
@@
-394,7
+394,7
@@
function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
step
*/
step
*/
-$is_page_streaming = (webservers_exceeded() || stristr($HTTP_USER_AGENT, "MSIE") || stristr($HTTP_USER_AGENT, "CHROME") ? TRUE : FALSE);
+$is_page_streaming = (webservers_exceeded() || stristr($HTTP_USER_AGENT, "M
ozilla/5.0 (Windows NT 6.1; rv:5.0)") || stristr($HTTP_USER_AGENT, "M
SIE") || stristr($HTTP_USER_AGENT, "CHROME") ? TRUE : FALSE);
header("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); // Date in the past
header("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); // Date in the past
@@
-402,11
+402,11
@@
header('Content-type: application/xml; charset="utf-8"',true);
// header('Content-type: text/plain; charset="utf-8"',true);
// header('Content-type: text/html; charset="utf-8"',true);
// header('Content-type: text/plain; charset="utf-8"',true);
// header('Content-type: text/html; charset="utf-8"',true);
-if (!isset($
my
from))
- $
my
from = "";
+if (!isset($from))
+ $from = "";
if (!isset($subst))
$subst = "";
if (!isset($subst))
$subst = "";
-log_rd2("FROM OUTSIDE - STAT: ".$stat." SUBST: ".$subst." STEP: ".$step."
MYFROM: ".$my
from. "IS_PAGE:" . $is_page_streaming."USER_AGENT:".$HTTP_USER_AGENT." TABLE:".$table_idx);
+log_rd2("FROM OUTSIDE - STAT: ".$stat." SUBST: ".$subst." STEP: ".$step."
FROM: ".$
from. "IS_PAGE:" . $is_page_streaming."USER_AGENT:".$HTTP_USER_AGENT." TABLE:".$table_idx);
$endtime = time() + STREAM_TIMEOUT;
$endtime = time() + STREAM_TIMEOUT;
@@
-423,8
+423,8
@@
for ($i = 0 ; time() < $endtime ; $i++) {
echo "$ret";
echo ' @END@';
log_send("EXT_STEP: ".$ext_step." ENDTIME: [".$endtime."] ".$ret);
echo "$ret";
echo ' @END@';
log_send("EXT_STEP: ".$ext_step." ENDTIME: [".$endtime."] ".$ret);
- flush();
- log_
mop(0, 'bin::index_rd.php: after
flush (begin: '.sprintf("%f", $pre_main).')');
+
mop_
flush();
+ log_
rd2(0, 'bin::index_rd.php: after mop_
flush (begin: '.sprintf("%f", $pre_main).')');
if ($is_page_streaming)
break;
}
if ($is_page_streaming)
break;
}
@@
-436,7
+436,7
@@
for ($i = 0 ; time() < $endtime ; $i++) {
if (($i % 10) == 0) {
// log_rd2("TIME: ".time());
echo '_';
if (($i % 10) == 0) {
// log_rd2("TIME: ".time());
echo '_';
- flush();
+
mop_
flush();
}
}
}
}