Ticket #2280: custom_content_type.patch

controllers.py

@@ -262 +262 @@
         expose decorator.
         """
 
+        content_type, engine_name, template_name, exclude_names = \
+            controller.decoration.lookup_template_engine(pylons.request)
+
+        if content_type != CUSTOM_CONTENT_TYPE:
+            pylons.response.headers['Content-Type'] = content_type
+
         # skip all the complicated stuff if we're don't have a response dict
         # to work with.
         if not isinstance(response, dict):
             return response
 
-
-        content_type, engine_name, template_name, exclude_names = \
-            controller.decoration.lookup_template_engine(pylons.request)
-
-        pylons.response.headers['Content-Type'] = content_type
-
         # Save these objeccts as locals from the SOP to avoid expensive lookups
         req = pylons.request._current_obj()
         tmpl_context = pylons.tmpl_context._current_obj()