diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-05-31 01:51:31 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-05-31 01:51:31 +0200 |
| commit | ec92fca8c030fe5971a034a658033f70965b990a (patch) | |
| tree | ef9a2049eeab539d13e1f9662fd51220ab4ee817 /libmproxy/onboarding/app.py | |
| parent | 0f8e8ee1ad667c8d747d5876f9b630ecbc01d7e9 (diff) | |
| parent | a05a70d8168a07c92b2a3ecbbb1958d85532efe3 (diff) | |
| download | mitmproxy-ec92fca8c030fe5971a034a658033f70965b990a.tar.gz mitmproxy-ec92fca8c030fe5971a034a658033f70965b990a.tar.bz2 mitmproxy-ec92fca8c030fe5971a034a658033f70965b990a.zip | |
Merge branch 'master' of github.com:mitmproxy/mitmproxy
Diffstat (limited to 'libmproxy/onboarding/app.py')
| -rw-r--r-- | libmproxy/onboarding/app.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/libmproxy/onboarding/app.py b/libmproxy/onboarding/app.py index 37f05e96..6edd74b1 100644 --- a/libmproxy/onboarding/app.py +++ b/libmproxy/onboarding/app.py @@ -45,7 +45,10 @@ class PEM(tornado.web.RequestHandler): def get(self): p = os.path.join(self.request.master.server.config.cadir, self.filename) self.set_header("Content-Type", "application/x-x509-ca-cert") - self.set_header("Content-Disposition", "inline; filename={}".format(self.filename)) + self.set_header( + "Content-Disposition", + "inline; filename={}".format( + self.filename)) with open(p, "rb") as f: self.write(f.read()) @@ -59,7 +62,10 @@ class P12(tornado.web.RequestHandler): def get(self): p = os.path.join(self.request.master.server.config.cadir, self.filename) self.set_header("Content-Type", "application/x-pkcs12") - self.set_header("Content-Disposition", "inline; filename={}".format(self.filename)) + self.set_header( + "Content-Disposition", + "inline; filename={}".format( + self.filename)) with open(p, "rb") as f: self.write(f.read()) @@ -78,7 +84,6 @@ application = tornado.web.Application( } ), ], - #debug=True + # debug=True ) mapp = Adapter(application) - |