Skip to content

Commit

Permalink
don't add the ssl exception handling to the network code until we've …
Browse files Browse the repository at this point in the history
…successfully created an ssl socket

git-svn-id: https://xpra.org/svn/Xpra/trunk@13156 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Aug 1, 2016
1 parent 40b6022 commit 7feb104
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions src/xpra/scripts/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -1657,11 +1657,12 @@ def ssl_wrap_socket_fn(opts, server_side=True):
})
wrap_socket = ssl.wrap_socket
del opts
#ensure we handle ssl exceptions as we should from now on:
from xpra.net.bytestreams import init_ssl
init_ssl()
def do_wrap_socket(tcp_socket):
return wrap_socket(tcp_socket, **kwargs)
ssl_sock = wrap_socket(tcp_socket, **kwargs)
#ensure we handle ssl exceptions as we should from now on:
from xpra.net.bytestreams import init_ssl
init_ssl()
return ssl_sock
return do_wrap_socket


Expand Down

0 comments on commit 7feb104

Please sign in to comment.