aboutsummaryrefslogtreecommitdiffstats
path: root/libpathod/pathod.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2012-10-28 09:06:55 +1300
committerAldo Cortesi <aldo@nullcube.com>2012-10-28 09:06:55 +1300
commitf54ed69a358d2dd059bd844c752f96e29e90e269 (patch)
treee2d08e37f36df1bdca22b20b756aaea66562cca6 /libpathod/pathod.py
parentac5aacce443f619bce2f31a1c016904da1930510 (diff)
downloadmitmproxy-f54ed69a358d2dd059bd844c752f96e29e90e269.tar.gz
mitmproxy-f54ed69a358d2dd059bd844c752f96e29e90e269.tar.bz2
mitmproxy-f54ed69a358d2dd059bd844c752f96e29e90e269.zip
Adjust serve() API.
Diffstat (limited to 'libpathod/pathod.py')
-rw-r--r--libpathod/pathod.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/libpathod/pathod.py b/libpathod/pathod.py
index 5d787c55..d80a9018 100644
--- a/libpathod/pathod.py
+++ b/libpathod/pathod.py
@@ -21,14 +21,14 @@ class PathodHandler(tcp.BaseHandler):
c = self.server.check_policy(crafted)
if c:
err = language.PathodErrorResponse(c)
- err.serve(self.server.request_settings, self.wfile)
+ err.serve(self.wfile, self.server.request_settings)
log = dict(
type = "error",
msg = c
)
return False, log
- response_log = crafted.serve(self.server.request_settings, self.wfile)
+ response_log = crafted.serve(self.wfile, self.server.request_settings)
log = dict(
type = "crafted",
request=request_log,
@@ -106,7 +106,7 @@ class PathodHandler(tcp.BaseHandler):
return self.serve_crafted(crafted, request_log)
elif self.server.noweb:
crafted = language.PathodErrorResponse("Access Denied")
- crafted.serve(self.server.request_settings, self.wfile)
+ crafted.serve(self.wfile, self.server.request_settings)
return False, dict(type = "error", msg="Access denied: web interface disabled")
else:
self.info("app: %s %s"%(method, path))