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
defa83c
..
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 ? '
hstm.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('
hstm.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);|
hstm.xhr_rd
_abort();");
+ return ("sleep(gst,20000);|
xstm.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);|
hstm.xhr_rd
_abort();");
+ return ("sleep(gst,20000);|
xstm.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);|
hstm.xhr_rd
_abort();");
+// return ("sleep(gst,20000);|
xstm.xhr
_abort();");
// }
// $first_loop = FALSE;
// }
// $first_loop = FALSE;
@@
-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;