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

Merge pull request #1416 from mhils/issue-1396

Browse Source 
fix #1396, fix #1205, fix #1374
This commit is contained in:
Maximilian Hils 2016-07-23 15:37:23 -07:00 committed by GitHub
commit ea718df111
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mitmproxy/console/flowlist.py
View File

@ -188,6 +188,7 @@ 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":
if not self.flow.reply.acked:
self.flow.kill(self.master) 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)
@ -255,6 +256,7 @@ class ConnectionItem(urwid.WidgetWrap):
callback = self.save_flows_prompt, callback = self.save_flows_prompt,
) )
elif key == "X": elif key == "X":
if not self.flow.reply.acked:
self.flow.kill(self.master) self.flow.kill(self.master)
elif key == "enter": elif key == "enter":
if self.flow.request: if self.flow.request:

1
mitmproxy/console/flowview.py
View File

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

1
mitmproxy/web/app.py
View File

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