diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-01-09 16:40:32 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-01-09 16:40:32 +0100 |
| commit | 40c28b79d1c1aa56584cb11ac599cb80d9e03e94 (patch) | |
| tree | 856f5e2ec41cc9018d0500a461109e68d15f5edc | |
| parent | 8af26bd0b7bbde32a95ce937afc178e75c51da71 (diff) | |
| parent | dcc248797f92ec8c5971849e6f907a6bd4f2a4a3 (diff) | |
| download | mitmproxy-40c28b79d1c1aa56584cb11ac599cb80d9e03e94.tar.gz mitmproxy-40c28b79d1c1aa56584cb11ac599cb80d9e03e94.tar.bz2 mitmproxy-40c28b79d1c1aa56584cb11ac599cb80d9e03e94.zip | |
Merge branch 'master' of github.com:mitmproxy/mitmproxy
| -rw-r--r-- | doc-src/scripting/inlinescripts.html | 4 | ||||
| -rw-r--r-- | libmproxy/console/__init__.py | 12 |
2 files changed, 12 insertions, 4 deletions
diff --git a/doc-src/scripting/inlinescripts.html b/doc-src/scripting/inlinescripts.html index 2c3e0d6f..7f05eedf 100644 --- a/doc-src/scripting/inlinescripts.html +++ b/doc-src/scripting/inlinescripts.html @@ -130,7 +130,7 @@ The main classes you will deal with in writing mitmproxy scripts are: </td> </tr> <tr> - <th>libmproxy.certutils.SSLCert</th> + <th>netlib.certutils.SSLCert</th> <td>Exposes information SSL certificates.</td> </tr> </table> @@ -174,4 +174,4 @@ matching events will be skipped. ## Spaces in the script path By default, spaces are interpreted as separator between the inline script and its arguments (e.g. <code>-s "foo.py 42"</code>). Consequently, the script path needs to be wrapped in a separate pair of quotes if it contains spaces: -<code>-s "'./foo bar/baz.py' 42"</code>.
\ No newline at end of file +<code>-s "'./foo bar/baz.py' 42"</code>. diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py index a8c728a9..7e770723 100644 --- a/libmproxy/console/__init__.py +++ b/libmproxy/console/__init__.py @@ -508,14 +508,22 @@ class ConsoleMaster(flow.FlowMaster): def client_playback_path(self, path): err, ret = self._readflow(path) if err: - self.statusbar.message(ret) + if not self.statusbar: + print >> sys.stderr, ret + sys.exit(1) + else: + self.statusbar.message(ret) else: self.start_client_playback(ret, False) def server_playback_path(self, path): err, ret = self._readflow(path) if err: - self.statusbar.message(ret) + if not self.statusbar: + print >> sys.stderr, ret + sys.exit(1) + else: + self.statusbar.message(ret) else: self.start_server_playback( ret, |