aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/proxy.py
diff options
context:
space:
mode:
authorHenrik Nordstrom <henrik@henriknordstrom.ne>2010-11-12 13:18:42 +0100
committerHenrik Nordstrom <henrik@henriknordstrom.net>2011-02-10 02:59:51 +0100
commit98b1acc51d3b58097c4ed5b607535fd7bc3dd7e4 (patch)
treeae356172743d384ebdefbf60635f4714dee13f9f /libmproxy/proxy.py
parentfcc39e1aaf6ca3171af00f5e602aa88370b7ef30 (diff)
downloadmitmproxy-98b1acc51d3b58097c4ed5b607535fd7bc3dd7e4.tar.gz
mitmproxy-98b1acc51d3b58097c4ed5b607535fd7bc3dd7e4.tar.bz2
mitmproxy-98b1acc51d3b58097c4ed5b607535fd7bc3dd7e4.zip
Add response creation to edit function on intercepted requests
Diffstat (limited to 'libmproxy/proxy.py')
-rw-r--r--libmproxy/proxy.py14
1 files changed, 10 insertions, 4 deletions
diff --git a/libmproxy/proxy.py b/libmproxy/proxy.py
index eefa6905..44bc10e2 100644
--- a/libmproxy/proxy.py
+++ b/libmproxy/proxy.py
@@ -378,11 +378,17 @@ class ProxyHandler(SocketServer.StreamRequestHandler):
if request is None:
self.finish()
return
- server = ServerConnection(request)
- response = server.read_response()
- response = response.send(self.mqueue)
+ if request.is_response():
+ response = request
+ request = False
+ response = response.send(self.mqueue)
+ else:
+ server = ServerConnection(request)
+ response = server.read_response()
+ response = response.send(self.mqueue)
+ if response is None:
+ server.terminate()
if response is None:
- server.terminate()
self.finish()
return
self.send_response(response)