From ce48cb4debab8caa518ea54e36dee722aaabb8a5 Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Fri, 5 Aug 2011 09:41:29 +1200
Subject: Make scripted rewriting of saved traffic work in mitmdump.

---
 libmproxy/dump.py | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/libmproxy/dump.py b/libmproxy/dump.py
index 6f544d6a..67f39a06 100644
--- a/libmproxy/dump.py
+++ b/libmproxy/dump.py
@@ -85,15 +85,6 @@ class DumpMaster(flow.FlowMaster):
                 not options.keepserving
             )
 
-        if options.rfile:
-            path = os.path.expanduser(options.rfile)
-            try:
-                f = file(path, "r")
-                freader = flow.FlowReader(f)
-            except IOError, v:
-                raise DumpError(v.strerror)
-            self.load_flows(freader)
-
         if options.client_replay:
             self.start_client_playback(
                 self._readflow(options.client_replay),
@@ -105,6 +96,16 @@ class DumpMaster(flow.FlowMaster):
             if err:
                 raise DumpError(err)
 
+        if options.rfile:
+            path = os.path.expanduser(options.rfile)
+            try:
+                f = file(path, "r")
+                freader = flow.FlowReader(f)
+            except IOError, v:
+                raise DumpError(v.strerror)
+            self.load_flows(freader)
+
+
     def _readflow(self, path):
         path = os.path.expanduser(path)
         try:
-- 
cgit v1.2.3