o fixed WSGIResponse default headers only being inherited when a mimetype was specified

o default WSGIRequest's decoding error handler to 'replace'. if sent bad data,
it's more appropriate to just convert it to bad unicode data instead of
raising an exception

1 files changed, 2 insertions, 2 deletions

diff --git a/paste/wsgiwrappers.py b/paste/wsgiwrappers.py
index 334a5c2..99a57fc 100644
--- a/paste/wsgiwrappers.py
+++ b/paste/wsgiwrappers.py
@@ -99,7 +99,7 @@ class WSGIRequest(object):
     You are free to subclass this object.
 
     """
-    defaults = StackedObjectProxy(default=dict(charset=None, errors='strict',
+    defaults = StackedObjectProxy(default=dict(charset=None, errors='replace',
                                                decode_param_names=False,
                                                language='en-us'))
     def __init__(self, environ):
@@ -312,7 +312,7 @@ class WSGIResponse(object):
             charset = defaults.get('charset')
             if charset:
                 mimetype = '%s; charset=%s' % (mimetype, charset)
-            self.headers.update(defaults.get('headers', {}))
+        self.headers.update(defaults.get('headers', {}))
         self.headers['Content-Type'] = mimetype
         self.errors = defaults.get('errors', 'strict')