#3313 enable auto-upgrades by default

Xpra-org · Jul 12, 2023 · c2ac508 · c2ac508
1 parent c3b450b
commit c2ac508
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/xpra/net/common.py b/xpra/net/common.py
@@ -30,7 +30,7 @@ class ConnectionClosedException(Exception):
 
 MAX_PACKET_SIZE : int = envint("XPRA_MAX_PACKET_SIZE", 16*1024*1024)
 FLUSH_HEADER : bool = envbool("XPRA_FLUSH_HEADER", True)
-SSL_UPGRADE : bool = envbool("XPRA_SSL_UPGRADE", False)
+SSL_UPGRADE : bool = envbool("XPRA_SSL_UPGRADE", True)
 
 SOCKET_TYPES : Tuple[str, ...] = ("tcp", "ws", "wss", "ssl", "ssh", "rfb", "vsock", "socket", "named-pipe", "quic")
 

diff --git a/xpra/server/server_core.py b/xpra/server/server_core.py
@@ -2132,7 +2132,6 @@ def _process_ssl_upgrade(self, proto, packet):
             self.disconnect_protocol(proto, "failed to upgrade socket to ssl")
             conn.close()
             return
-        # sock, sockname, address, endpoint = conn._socket, conn.local, conn.remote, conn.endpoint
         ssl_conn = SSLSocketConnection(ssl_sock, conn.local, conn.remote, conn.endpoint, "ssl", socket_options=options)
         ssl_conn.socktype_wrapped = socktype
         protocol_class = get_server_protocol_class(new_socktype)