Do not hang on non-ready client connection.
Wait 3 seconds for the client to send something. If no data is available within 3 seconds then close the connection. It's probably a non-WebSockets client that is waiting for the server to say something first.
This commit is contained in:
parent
046e22ea00
commit
9c4cf4ada2
|
@ -213,7 +213,11 @@ Connection: Upgrade\r
|
|||
|
||||
stype = ""
|
||||
|
||||
# Peek, but don't read the data
|
||||
ready = select.select([sock], [], [], 3)[0]
|
||||
if not ready:
|
||||
raise self.EClose("ignoring socket not ready")
|
||||
# Peek, but do not read the data so that we have a opportunity
|
||||
# to SSL wrap the socket first
|
||||
handshake = sock.recv(1024, socket.MSG_PEEK)
|
||||
#self.msg("Handshake [%s]" % repr(handshake))
|
||||
|
||||
|
|
|
@ -160,7 +160,10 @@ Traffic Legend:
|
|||
try:
|
||||
self.do_proxy(client, tsock)
|
||||
except:
|
||||
if tsock: tsock.close()
|
||||
if tsock:
|
||||
tsock.close()
|
||||
self.vmsg("%s:%s: Target closed" %(
|
||||
self.target_host, self.target_port))
|
||||
if self.rec:
|
||||
self.rec.write("'EOF']\n")
|
||||
self.rec.close()
|
||||
|
|
Loading…
Reference in New Issue