author | Alexandre Fayolle <alexandre.fayolle@logilab.fr> |
Tue, 28 Sep 2010 16:52:45 +0200 | |
branch | stable |
changeset 6353 | b622602f8e9d |
parent 6352 | 2259d834d757 |
child 6354 | 73bf870d37d5 |
web/request.py | file | annotate | diff | comparison | revisions |
--- a/web/request.py Tue Sep 28 16:50:34 2010 +0200 +++ b/web/request.py Tue Sep 28 16:52:45 2010 +0200 @@ -531,7 +531,7 @@ """set output content type for this request. An optional filename may be given """ - if content_type.startswith('text/'): + if content_type.startswith('text/') and ';charset=' not in content_type: content_type += ';charset=' + (encoding or self.encoding) self.set_header('content-type', content_type) if filename: