Merge pull request #929 from wong2/dev

propagate proxy_protocol_info to keep-alive requests correctly, fix #923
This commit is contained in:
Stéphane Wirtel 2014-11-06 07:58:13 +01:00
commit ccb08b541d

View File

@ -38,14 +38,17 @@ class AsyncWorker(base.Worker):
self.handle_request(listener_name, req, client, addr)
else:
# keepalive loop
proxy_protocol_info = req.proxy_protocol_info
proxy_protocol_info = {}
while True:
req = None
with self.timeout_ctx():
req = six.next(parser)
if not req:
break
req.proxy_protocol_info = proxy_protocol_info
if req.proxy_protocol_info:
proxy_protocol_info = req.proxy_protocol_info
else:
req.proxy_protocol_info = proxy_protocol_info
self.handle_request(listener_name, req, client, addr)
except http.errors.NoMoreData as e:
self.log.debug("Ignored premature client disconnection. %s", e)