projects
/
brisk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add override configuration file option to builder.sh
[brisk.git]
/
web
/
xynt-streaming.js
diff --git
a/web/xynt-streaming.js
b/web/xynt-streaming.js
index
788a783
..
13eeb7b
100644
(file)
--- a/
web/xynt-streaming.js
+++ b/
web/xynt-streaming.js
@@
-544,6
+544,8
@@
xynt_streaming.prototype = {
win: null,
transp_type: null,
transp_port: 80,
win: null,
transp_type: null,
transp_port: 80,
+ transp_type_cur: null,
+ transp_port_cur: 80,
transp_fback: 0,
transp: null,
console: null,
transp_fback: 0,
transp: null,
console: null,
@@
-631,15
+633,26
@@
xynt_streaming.prototype = {
// page arrangement
this.page = url_complete(this.win.location.href, this.page);
// page arrangement
this.page = url_complete(this.win.location.href, this.page);
+ // DEFAULT TRANSPORT PROTOCOL HERE websocketsec, websocket
if (this.transp_fback > 0) {
if (this.transp_fback > 0) {
- transp_type = "websocket";
- transp_port = (this.transp_fback == 2 ? 80 : 8080);
+ if (location.protocol == 'https:') {
+ transp_type = "websocketsec";
+ transp_port = 443;
+ }
+ else {
+ transp_type = "websocket";
+ transp_port = (this.transp_fback == 2 ? 80 : 8080);
+ }
+
}
else {
transp_type = this.transp_type;
transp_port = this.transp_port;
}
}
else {
transp_type = this.transp_type;
transp_port = this.transp_port;
}
+ this.transp_type_cur = transp_type;
+ this.transp_port_cur = transp_port;
+
if (transp_type == "websocket" || transp_type == "websocketsec") {
var end_proto, first_slash, newpage;
if (transp_type == "websocket" || transp_type == "websocketsec") {
var end_proto, first_slash, newpage;
@@
-900,6
+913,10
@@
xynt_streaming.prototype = {
// alert("SINGLE: ["+singlecomm+"]");
// window.console.log("["+singlecomm+"]");
this.cmdproc(singlecomm);
// alert("SINGLE: ["+singlecomm+"]");
// window.console.log("["+singlecomm+"]");
this.cmdproc(singlecomm);
+ if (this.transp_type_cur) {
+ this.transp_type = this.transp_type_cur;
+ this.transp_port = this.transp_port_cur;
+ }
again = 1;
}
} while (again);
again = 1;
}
} while (again);