diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2012-07-24 15:15:41 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2012-07-24 15:15:41 +1200 |
| commit | b4e9e55c3420f9bcd27142dfaaf0934e73d90b6f (patch) | |
| tree | 1b116750f1fc4eba572902429dc2d0bd2d2f07ba /libmproxy/flow.py | |
| parent | a5bf9d3eb3da9de9aa9438de3c192a3023c90e6c (diff) | |
| download | mitmproxy-b4e9e55c3420f9bcd27142dfaaf0934e73d90b6f.tar.gz mitmproxy-b4e9e55c3420f9bcd27142dfaaf0934e73d90b6f.tar.bz2 mitmproxy-b4e9e55c3420f9bcd27142dfaaf0934e73d90b6f.zip | |
Be more tolerant of corrupted or truncated flows.
We load as far as possible. mitmproxy will only terminate if it was not able to
recover any flows. mitmdump will stop loading as soon as an error is
encountered, but not exit with an error.
Diffstat (limited to 'libmproxy/flow.py')
| -rw-r--r-- | libmproxy/flow.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmproxy/flow.py b/libmproxy/flow.py index aa02b5c5..ef226641 100644 --- a/libmproxy/flow.py +++ b/libmproxy/flow.py @@ -1482,7 +1482,7 @@ class FlowReader: raise FlowReadError("Incompatible serialized data version: %s"%v) off = self.fo.tell() yield Flow._from_state(data) - except ValueError: + except ValueError, v: # Error is due to EOF if self.fo.tell() == off and self.fo.read() == '': return |