jingrow/gunicorn
1
0
Fork 0
mirror of https://github.com/frappe/gunicorn.git synced 2026-01-14 11:09:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix websocket with protocol 076. Fix from tom on irc. Thanks!

Browse Source
This commit is contained in:
benoitc 2010-06-24 16:20:48 +02:00
parent 9bc19c2c86
commit a461817309
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gunicorn/arbiter.py
View File

@ -470,6 +470,7 @@ class Arbiter(object):
worker = self.WORKERS.pop(pid) worker = self.WORKERS.pop(pid)
worker.tmp.close() worker.tmp.close()
os.unlink(worker.tmpname) os.unlink(worker.tmpname)
return
except (KeyError, OSError): except (KeyError, OSError):
return return
raise raise

2
gunicorn/http/message.py
View File

@ -79,6 +79,8 @@ class Message(object):
clength = None clength = None
elif name.upper() == "TRANSFER-ENCODING": elif name.upper() == "TRANSFER-ENCODING":
chunked = value.lower() == "chunked" chunked = value.lower() == "chunked"
elif name.upper() == "SEC-WEBSOCKET-KEY1":
clength = 8
if chunked: if chunked:
self.body = Body(ChunkedReader(self, self.unreader)) self.body = Body(ChunkedReader(self, self.unreader))

5
gunicorn/workers/ggevent.py
View File

@ -41,9 +41,10 @@ class GEventWorker(AsyncWorker):
break break
gevent.sleep(0.1) gevent.sleep(0.1)
pool.join(timeout=self.timeout)
except KeyboardInterrupt: except KeyboardInterrupt:
pass pass
pool.join(timeout=self.timeout)
os._exit(3) os._exit(3)
def acceptor(self, pool): def acceptor(self, pool):
@ -55,6 +56,8 @@ class GEventWorker(AsyncWorker):
gt._conn = conn gt._conn = conn
gt.link(self.cleanup) gt.link(self.cleanup)
conn, addr, gt = None, None, None conn, addr, gt = None, None, None
except KeyboardInterrupt:
return
except greenlet.GreenletExit: except greenlet.GreenletExit:
return return
except: except: