From 324d7c3955bef29745183949baed48ee286c126d Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Sun, 13 Mar 2011 16:50:11 +1300
Subject: Add client plaback to mitmproxy.

---
 libmproxy/flow.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'libmproxy/flow.py')

diff --git a/libmproxy/flow.py b/libmproxy/flow.py
index 3764fc95..fb5c82d7 100644
--- a/libmproxy/flow.py
+++ b/libmproxy/flow.py
@@ -287,13 +287,14 @@ class Flow:
                 return pattern(self.request)
         return False
 
-    def kill(self):
+    def kill(self, master):
         self.error = proxy.Error(self.request, "Connection killed")
         if self.request and not self.request.acked:
             self.request.ack(None)
         elif self.response and not self.response.acked:
             self.response.ack(None)
         self.intercepting = False
+        master.handle_error(self.error)
 
     def intercept(self):
         self.intercepting = True
@@ -552,8 +553,7 @@ class FlowMaster(controller.Master):
             pb = self.do_server_playback(f)
             if not pb:
                 if self.kill_nonreplay:
-                    f.kill()
-                    self.handle_error(f.error)
+                    f.kill(self)
                 else:
                     r.ack()
         return f
-- 
cgit v1.2.3