aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Roth <code@leveldown.de>2010-02-24 23:25:37 +0100
committerThomas Roth <code@leveldown.de>2010-02-24 23:25:37 +0100
commit79d2abb23ab869d0345f8392130e1d00e15dc704 (patch)
tree02a4219824878ac0dab6b6a2c9ff6d685abb9b56
parente2c078e9a29d26e7bd62ea8f857737d85164e3f1 (diff)
downloadmitmproxy-79d2abb23ab869d0345f8392130e1d00e15dc704.tar.gz
mitmproxy-79d2abb23ab869d0345f8392130e1d00e15dc704.tar.bz2
mitmproxy-79d2abb23ab869d0345f8392130e1d00e15dc704.zip
Fixes blocking problem with a workaround which sets a timeout of 0.1 seconds.
-rw-r--r--libmproxy/console.py1
-rw-r--r--todo2
2 files changed, 2 insertions, 1 deletions
diff --git a/libmproxy/console.py b/libmproxy/console.py
index f1dc8396..677f8627 100644
--- a/libmproxy/console.py
+++ b/libmproxy/console.py
@@ -961,6 +961,7 @@ class ConsoleMaster(controller.Master):
size = self.drawscreen()
self.statusbar.redraw()
self.tick(q)
+ self.ui.set_input_timeouts(max_wait=0.1)
keys = self.ui.get_input()
for k in keys:
if self.prompting:
diff --git a/todo b/todo
index 297e3607..0362cf35 100644
--- a/todo
+++ b/todo
@@ -9,11 +9,11 @@ Future:
- Saving contents to file
- Shortcut for viewing in pager
- Serializing and de-serializing requests and responses.
+ - Use real non-blocking input handling to minimize cpu load.
Bugs:
- - get_input() is blocking the complete program.
- 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