Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-29 19:08:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:mitmproxy/mitmproxy

Browse Source
This commit is contained in:
Maximilian Hils 2015-01-09 16:40:32 +01:00
commit 40c28b79d1
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc-src/scripting/inlinescripts.html
View File

@ -130,7 +130,7 @@ The main classes you will deal with in writing mitmproxy scripts are:
</td> </td>
</tr> </tr>
<tr> <tr>
<th>libmproxy.certutils.SSLCert</th> <th>netlib.certutils.SSLCert</th>
<td>Exposes information SSL certificates.</td> <td>Exposes information SSL certificates.</td>
</tr> </tr>
</table> </table>

12
libmproxy/console/__init__.py
View File

@ -508,14 +508,22 @@ class ConsoleMaster(flow.FlowMaster):
def client_playback_path(self, path): def client_playback_path(self, path):
err, ret = self._readflow(path) err, ret = self._readflow(path)
if err: if err:
self.statusbar.message(ret) if not self.statusbar:
print >> sys.stderr, ret
sys.exit(1)
else:
self.statusbar.message(ret)
else: else:
self.start_client_playback(ret, False) self.start_client_playback(ret, False)
def server_playback_path(self, path): def server_playback_path(self, path):
err, ret = self._readflow(path) err, ret = self._readflow(path)
if err: if err:
self.statusbar.message(ret) if not self.statusbar:
print >> sys.stderr, ret
sys.exit(1)
else:
self.statusbar.message(ret)
else: else:
self.start_server_playback( self.start_server_playback(
ret, ret,