diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2013-05-05 13:19:14 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2013-05-05 13:19:14 +1200 |
| commit | bc88930fb7724f77c7bf23d533550849c75351d7 (patch) | |
| tree | bb075645bbe7f98d2fd4d791509432e964f841c8 | |
| parent | 9fa09cc1f98d3df7a0a7f7b3ace3168f916f8f3e (diff) | |
| parent | 69a40c817935d08878192f87c85408bc10ca8d89 (diff) | |
| download | mitmproxy-bc88930fb7724f77c7bf23d533550849c75351d7.tar.gz mitmproxy-bc88930fb7724f77c7bf23d533550849c75351d7.tar.bz2 mitmproxy-bc88930fb7724f77c7bf23d533550849c75351d7.zip | |
Merge branch 'master' of ssh.github.com:cortesi/mitmproxy
| -rw-r--r-- | libmproxy/console/contentview.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libmproxy/console/contentview.py b/libmproxy/console/contentview.py index 53841c73..8dd8ad1d 100644 --- a/libmproxy/console/contentview.py +++ b/libmproxy/console/contentview.py @@ -389,8 +389,11 @@ class ViewProtobuf: stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE) - out, _ = p.communicate(input=content) - return out + out, err = p.communicate(input=content) + if out: + return out + else: + return err def __call__(self, hdrs, content, limit): decoded = self.decode_protobuf(content) |