mirror of
https://github.com/dkmstr/openuds.git
synced 2024-12-23 17:34:17 +03:00
Merge remote-tracking branch 'origin/v3.6'
This commit is contained in:
commit
4385fdf358
@ -128,5 +128,5 @@ class RemoteViewerFile:
|
|||||||
secure_channel='secure-channels=main;inputs;cursor;playback;record;display;usbredir;smartcard'
|
secure_channel='secure-channels=main;inputs;cursor;playback;record;display;usbredir;smartcard'
|
||||||
if self.ssl_connection and tls_port != '-1'
|
if self.ssl_connection and tls_port != '-1'
|
||||||
else '',
|
else '',
|
||||||
proxy=self.proxy,
|
proxy=f'proxy={self.proxy}' if self.proxy else '',
|
||||||
)
|
)
|
||||||
|
@ -137,6 +137,9 @@ class BaseSpiceTransport(transports.Transport):
|
|||||||
|
|
||||||
if con is None:
|
if con is None:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
if 'proxy' in con: # If we have a proxy, we can't check if it is available, return True
|
||||||
|
return True
|
||||||
|
|
||||||
port, secure_port = con['port'] or -1, con['secure_port'] or -1
|
port, secure_port = con['port'] or -1, con['secure_port'] or -1
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user