Skip to content

Commit

Permalink
this is redundant and less flexible (overrides the socket timeout tha…
Browse files Browse the repository at this point in the history
…t the proxy server can set via an env var)

git-svn-id: https://xpra.org/svn/Xpra/trunk@13864 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Sep 25, 2016
1 parent 92cfce6 commit 398c3f5
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions src/xpra/server/server_core.py
Original file line number Diff line number Diff line change
Expand Up @@ -690,8 +690,6 @@ def start_websockify(self, conn, frominfo):
# (this should not be needed on any other platform,
# maybe this should go in websockify somewhere instead)
# * the proxy server needs this to steal the connection
sock.setblocking(False)
sock.settimeout(0.1)
from xpra.net.bytestreams import untilConcludes
saved_recv = sock.recv
saved_send = sock.send
Expand Down

0 comments on commit 398c3f5

Please sign in to comment.