Compare commits

..

No commits in common. "ce76cedb0dbebdcc6ea76b14b41334cf92e91f81" and "c81c27073cada91940685dbb85f703ca4c3a4644" have entirely different histories.

2 changed files with 4 additions and 19 deletions

View file

@ -1249,6 +1249,7 @@ class Inbound extends XrayCommonClass {
id: clientId,
scy: security,
net: this.stream.network,
type: 'none',
tls: tls,
};
const network = this.stream.network;
@ -1283,7 +1284,7 @@ class Inbound extends XrayCommonClass {
const xhttp = this.stream.xhttp;
obj.path = xhttp.path;
obj.host = xhttp.host?.length > 0 ? xhttp.host : this.getHeader(xhttp, 'host');
obj.type = xhttp.mode;
obj.mode = xhttp.mode;
}
if (tls === 'tls') {

View file

@ -616,27 +616,11 @@ class Outbound extends CommonClass {
}
canEnableMux() {
// Disable Mux if flow is set
if (this.settings.flow && this.settings.flow !== '') {
if (this.settings.flow && this.settings.flow != '') {
this.mux.enabled = false;
return false;
}
// Disable Mux if network is xhttp
if (this.stream.network === 'xhttp') {
this.mux.enabled = false;
return false;
}
// Allow Mux only for these protocols
return [
Protocols.VMess,
Protocols.VLESS,
Protocols.Trojan,
Protocols.Shadowsocks,
Protocols.HTTP,
Protocols.Socks
].includes(this.protocol);
return [Protocols.VMess, Protocols.VLESS, Protocols.Trojan, Protocols.Shadowsocks, Protocols.HTTP, Protocols.Socks].includes(this.protocol);
}
hasVnext() {