aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Roth <code@leveldown.de>2010-02-24 23:32:56 +0100
committerThomas Roth <code@leveldown.de>2010-02-24 23:32:56 +0100
commit0fc864c419964d00b789faaa727362e7e36b6e6e (patch)
treedf6932812d608dfd84628516c0cea5d331925772
parent79d2abb23ab869d0345f8392130e1d00e15dc704 (diff)
downloadmitmproxy-0fc864c419964d00b789faaa727362e7e36b6e6e.tar.gz
mitmproxy-0fc864c419964d00b789faaa727362e7e36b6e6e.tar.bz2
mitmproxy-0fc864c419964d00b789faaa727362e7e36b6e6e.zip
Fixes a bug which caused a crash if you've tried to accept a connection which wasn't intercepted.
-rw-r--r--libmproxy/console.py11
-rw-r--r--todo1
2 files changed, 6 insertions, 6 deletions
diff --git a/libmproxy/console.py b/libmproxy/console.py
index 677f8627..fe2fa4b2 100644
--- a/libmproxy/console.py
+++ b/libmproxy/console.py
@@ -540,11 +540,12 @@ class Flow:
self.intercepting = True
def accept_intercept(self):
- if not self.request.acked:
- self.request.ack()
- elif self.response and not self.response.acked:
- self.response.ack()
- self.intercepting = False
+ if self.request:
+ if not self.request.acked:
+ self.request.ack()
+ elif self.response and not self.response.acked:
+ self.response.ack()
+ self.intercepting = False
class State:
diff --git a/todo b/todo
index 0362cf35..b949157f 100644
--- a/todo
+++ b/todo
@@ -15,7 +15,6 @@ Future:
Bugs:
- Exception handling for regular expression compiler in filt.py.
- - Fix crash cause on undefined request in libmproxy/console.py:543
- Fix crash on illegal regular expression on libmproxy/filt.py:76
- In some circumstances, long URLs in list view are line-broken oddly.
- Termination sometimes hangs.