Skip to content

Commit

Permalink
#1211: workaround is also needed on osx!?
Browse files Browse the repository at this point in the history
git-svn-id: https://xpra.org/svn/Xpra/trunk@13870 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Sep 25, 2016
1 parent 55651ea commit f23d02a
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions src/xpra/server/server_core.py
Original file line number Diff line number Diff line change
Expand Up @@ -686,13 +686,14 @@ def start_websockify(self, conn, frominfo):
try:
sock = conn._socket
WIN32 = sys.platform.startswith("win")
if WIN32:
OSX = sys.platform.startswith("darwin")
if WIN32 or OSX:
#the HTTP server fails on win32 if we don't use blocking sockets!
sock.settimeout(10.0)
def new_websocket_client(wsh):
netlog("new_websocket_client(%s) socket=%s", wsh, sock)
wsc = WebSocketConnection(sock, conn.local, conn.remote, conn.target, conn.socktype, wsh)
if WIN32:
if WIN32 or OSX:
# win32 servers don't seem to honour our request to use blocking sockets
# (this workaround should not be needed on any other platform,
# and maybe this should go in websockify somewhere instead)
Expand Down

0 comments on commit f23d02a

Please sign in to comment.