Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-23 00:01:36 +00:00
Code Issues Projects Releases Wiki Activity

fix #1396, fix #1205, fix #1374

Browse Source
This commit is contained in:
Maximilian Hils 2016-07-23 12:08:48 -07:00
parent fcb906dc97
commit ca493ad7f3
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mitmproxy/console/flowlist.py
View File

@ -188,7 +188,8 @@ class ConnectionItem(urwid.WidgetWrap):
self.flow.accept_intercept(self.master) self.flow.accept_intercept(self.master)
signals.flowlist_change.send(self) signals.flowlist_change.send(self)
elif key == "d": elif key == "d":
self.flow.kill(self.master) if not self.flow.reply.acked:
self.flow.kill(self.master)
self.state.delete_flow(self.flow) self.state.delete_flow(self.flow)
signals.flowlist_change.send(self) signals.flowlist_change.send(self)
elif key == "D": elif key == "D":
@ -255,7 +256,8 @@ class ConnectionItem(urwid.WidgetWrap):
callback = self.save_flows_prompt, callback = self.save_flows_prompt,
) )
elif key == "X": elif key == "X":
self.flow.kill(self.master) if not self.flow.reply.acked:
self.flow.kill(self.master)
elif key == "enter": elif key == "enter":
if self.flow.request: if self.flow.request:
self.master.view_flow(self.flow) self.master.view_flow(self.flow)

3
mitmproxy/console/flowview.py
View File

@ -569,7 +569,8 @@ class FlowView(tabs.Tabs):
else: else:
self.view_next_flow(self.flow) self.view_next_flow(self.flow)
f = self.flow f = self.flow
f.kill(self.master) if not f.reply.acked:
f.kill(self.master)
self.state.delete_flow(f) self.state.delete_flow(f)
elif key == "D": elif key == "D":
f = self.master.duplicate_flow(self.flow) f = self.master.duplicate_flow(self.flow)

3
mitmproxy/web/app.py
View File

@ -230,7 +230,8 @@ class AcceptFlow(RequestHandler):
class FlowHandler(RequestHandler): class FlowHandler(RequestHandler):
def delete(self, flow_id): def delete(self, flow_id):
self.flow.kill(self.master) if not self.flow.reply.acked:
self.flow.kill(self.master)
self.state.delete_flow(self.flow) self.state.delete_flow(self.flow)
def put(self, flow_id): def put(self, flow_id):