lib/merb/merb_controller.rb in merb-0.3.0 vs lib/merb/merb_controller.rb in merb-0.3.1
- old
+ new
@@ -37,10 +37,10 @@
# file uploads by writing a tempfile and passing a reference
# in params.
def initialize(request, env, args, response)
@env = MerbHash[env.to_hash]
@status, @method, @response, @headers = 200, (env[Mongrel::Const::REQUEST_METHOD]||Mongrel::Const::GET).downcase.to_sym, response,
- Mongrel::Const::CONTENT_TYPE_TEXT_HTML_HASH
+ {'Content-Type' =>'text/html'}
cookies = query_parse(@env[Mongrel::Const::HTTP_COOKIE], ';,')
querystring = query_parse(@env[Mongrel::Const::QUERY_STRING])
if MULTIPART_REGEXP =~ @env[Mongrel::Const::UPCASE_CONTENT_TYPE] && @method == :post
querystring.update(parse_multipart(request, $1))