Changeset 6340

Timestamp:

03/05/07 18:24:17 (2 years ago)

Author:

xal

Message:

Ignore odd charset declaration in CONTENT_TYPE header which would throw off mime type lookup.

Files:

• trunk/actionpack/lib/action_controller/request.rb (modified) (1 diff)
• trunk/actionpack/test/controller/request_test.rb (modified) (1 diff)

trunk/actionpack/lib/action_controller/request.rb

@@ -59 +59 @@
-      @content_type ||=
-        begin
-
+
+
-          
-          if x_post_format = @env['HTTP_X_POST_DATA_FORMAT']

trunk/actionpack/test/controller/request_test.rb

@@ -324 +324 @@
-    assert_equal Mime::JS, @request.format
-  end
+  
+  def test_content_type
+    @request.env["CONTENT_TYPE"] = "text/html"
+    assert_equal Mime::HTML, @request.content_type
+  end
+
+  def test_content_no_type
+    assert_equal nil, @request.content_type
+  end
+  
+  def test_content_type_xml
+    @request.env["CONTENT_TYPE"] = "application/xml"
+    assert_equal Mime::XML, @request.content_type
+  end
+
+  def test_content_type_with_charset
+    @request.env["CONTENT_TYPE"] = "application/xml; charset=UTF-8"
+    assert_equal Mime::XML, @request.content_type
+  end
-
-  protected