Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-30 03:14:22 +00:00
Code Issues Projects Releases Wiki Activity

start reraising exceptions properly

Browse Source
This commit is contained in:
Maximilian Hils 2015-09-10 16:24:22 +02:00
parent ebba79b655
commit 35a99d2faf
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libmproxy/protocol/http.py
View File

@ -1,4 +1,6 @@
from __future__ import (absolute_import, print_function, division) from __future__ import (absolute_import, print_function, division)
import six
import sys
from netlib import tcp from netlib import tcp
from netlib.http import http1, HttpErrorConnClosed, HttpError, Headers from netlib.http import http1, HttpErrorConnClosed, HttpError, Headers
@ -62,7 +64,7 @@ class _StreamingHttpLayer(_HttpLayer):
if response.body == CONTENT_MISSING: if response.body == CONTENT_MISSING:
raise HttpError(502, "Cannot assemble flow with CONTENT_MISSING") raise HttpError(502, "Cannot assemble flow with CONTENT_MISSING")
self.send_response_headers(response) self.send_response_headers(response)
self.send_response_body(response, response.body) self.send_response_body(response, [response.body])
class Http1Layer(_StreamingHttpLayer): class Http1Layer(_StreamingHttpLayer):
@ -381,9 +383,9 @@ class HttpLayer(Layer):
except NetLibError: except NetLibError:
pass pass
if isinstance(e, ProtocolException): if isinstance(e, ProtocolException):
raise e six.reraise(*sys.exc_info())
else: else:
raise ProtocolException("Error in HTTP connection: %s" % repr(e), e) six.reraise(ProtocolException, ProtocolException("Error in HTTP connection: %s" % repr(e), e), sys.exc_info()[2])
finally: finally:
flow.live = False flow.live = False