From 7da4a00a9bfb649615b0de899b91118de1bb9084 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 17 May 2017 05:26:25 +0530 Subject: [PATCH] Fix exception in error handler for websocket connections --- src/calibre/srv/http_request.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/calibre/srv/http_request.py b/src/calibre/srv/http_request.py index 91d81627e4..4a8b7eb4c0 100644 --- a/src/calibre/srv/http_request.py +++ b/src/calibre/srv/http_request.py @@ -98,6 +98,7 @@ def parse_uri(uri, parse_query=True): # HTTP Header parsing {{{ + comma_separated_headers = { 'Accept', 'Accept-Charset', 'Accept-Encoding', 'Accept-Language', 'Accept-Ranges', 'Allow', 'Cache-Control', @@ -288,7 +289,7 @@ class HTTPRequest(Connection): return 'State: %s Client: %s:%s Request: %s' % ( getattr(self.handle_event, '__name__', None), self.remote_addr, self.remote_port, - force_unicode(self.request_line, 'utf-8')) + force_unicode(getattr(self, 'request_line', 'WebSocketConnection'), 'utf-8')) def parse_header_line(self, parser, buf, event): line = self.readline(buf)