From 45628f79638764ac0c784daaa6b57fb4b839f67c Mon Sep 17 00:00:00 2001 From: Ilya Kreymer Date: Sat, 6 Sep 2014 18:35:30 -0700 Subject: [PATCH] wsgi_wrapper: ensure error handling doesn't throw decoding errors --- pywb/framework/wsgi_wrappers.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pywb/framework/wsgi_wrappers.py b/pywb/framework/wsgi_wrappers.py index 3498c819..74345352 100644 --- a/pywb/framework/wsgi_wrappers.py +++ b/pywb/framework/wsgi_wrappers.py @@ -121,15 +121,17 @@ class WSGIApp(object): status = '400 Bad Request' if hasattr(exc, 'url'): - err_url = exc.url + try: + err_url = exc.url.decode('utf-8', 'ignore') + except Exception: + err_url = None else: err_url = None try: - err_msg = exc.message.encode('utf-8') + err_msg = exc.message.decode('utf-8', 'ignore') except Exception: err_msg = exc.message - err_url = '' if print_trace: import traceback