From 116fcfcf7a744c98328bc9df87e9fa5490b66ae7 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Fri, 27 Apr 2012 15:56:42 +1200 Subject: Internal error page for WSGI. Also, 100% test coverage. --- libmproxy/wsgi.py | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) (limited to 'libmproxy') diff --git a/libmproxy/wsgi.py b/libmproxy/wsgi.py index 9fb5f0c5..0865ee72 100644 --- a/libmproxy/wsgi.py +++ b/libmproxy/wsgi.py @@ -55,6 +55,23 @@ class WSGIAdaptor: environ[key] = value return environ + def error_page(self, soc, headers_sent): + """ + Make a best-effort attempt to write an error page. If headers are + already sent, we just bung the error into the page. + """ + c = """ + +

Internal Server Error

+ + """ + if not headers_sent: + soc.write("HTTP/1.1 500 Internal Server Error%s\r\n") + soc.write("Content-Type: text/html\r\n") + soc.write("Content-Length: %s\r\n"%len(c)) + soc.write("\r\n") + soc.write(c) + def serve(self, request, soc): state = dict( response_started = False, @@ -97,12 +114,12 @@ class WSGIAdaptor: if not state["headers_sent"]: write("") except Exception, v: - print v try: - # Serve internal server error page - pass + self.error_page(soc, state["headers_sent"]) + # begin nocover except Exception, v: pass + # end nocover return errs.getvalue() -- cgit v1.2.3