0
@@ -50,8 +50,8 @@ module Merb
0
       ResponderMixin::TYPES.update(key => 
0
         {:accepts           => mimes, 
0
          :transform_method  => transform_method,
0
-                                                           # Use symbol to speed compares later
0
-         :response_headers  => new_response_headers.update(:"Content-Type" => content_type),
0
+         :content_type      => content_type,
0
+         :response_headers  => new_response_headers,
0
          :response_block    => block })
0
 
0
       mimes.each do |mime|

0
@@ -365,18 +365,14 @@ module Merb
0
 
0
       mime = Merb.available_mime_types[type]
0
       
0
-      headers["Content-Type"] = mime[:response_headers][:"Content-Type"]
0
+      headers["Content-Type"] = mime[:content_type]
0
       
0
       # merge any format specific response headers
0
-      mime[:response_headers].each do |key, value|
0
-        next if key == :"Content-Type"
0
-        headers[key] ||= value
0
-      end
0
+      mime[:response_headers].each { |k,v| headers[k] ||= v }
0
       
0
       # if given, use a block to finetune any runtime headers
0
-      if mime[:response_block].respond_to?(:call)
0
-        mime[:response_block].call(self)
0
-      end
0
+      mime[:response_block].call(self) if mime[:response_block]
0
+
0
       @_content_type = type
0
     end
0