From c6797b61d9723ef7fbaab6c86b7c963e9eecceec Mon Sep 17 00:00:00 2001 From: spez Date: Tue, 30 Sep 2008 12:36:10 -0700 Subject: [PATCH] fix content type --- r2/r2/config/middleware.py | 4 ++++ r2/r2/controllers/reddit_base.py | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/r2/r2/config/middleware.py b/r2/r2/config/middleware.py index ef9953648..0a9ba5f6e 100644 --- a/r2/r2/config/middleware.py +++ b/r2/r2/config/middleware.py @@ -300,6 +300,10 @@ class ExtensionMiddleware(object): #strip off the extension environ['PATH_INFO'] = path[:-(len(ext) + 1)] break + else: + environ['render_style'] = 'html' + environ['content_type'] = 'text/html; charset=UTF-8' + return self.app(environ, start_response) class RewriteMiddleware(object): diff --git a/r2/r2/controllers/reddit_base.py b/r2/r2/controllers/reddit_base.py index 36d49b872..246cc93b1 100644 --- a/r2/r2/controllers/reddit_base.py +++ b/r2/r2/controllers/reddit_base.py @@ -247,10 +247,10 @@ def set_subreddit(): def set_content_type(): e = request.environ - if e.has_key('extension'): - c.render_style = e['render_style'] - c.response_content_type = e['content_type'] + c.render_style = e['render_style'] + c.response_content_type = e['content_type'] + if e.has_key('extension'): ext = e['extension'] if ext == 'api' or ext.startswith('json'): c.response_access_control = 'allow <*>'