process charset parameter case insensitively

dwnichols · Apr 16, 2013 · 9c6dd9b · 9c6dd9b
1 parent b18a213
commit 9c6dd9b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/lib/httparty/request.rb b/lib/httparty/request.rb
@@ -179,11 +179,11 @@ def get_charset
         return nil
       end
 
-      if content_type =~ /;\s*charset\s*=\s*([^=,;"\s]+)/
+      if content_type =~ /;\s*charset\s*=\s*([^=,;"\s]+)/i
         return $1
       end
 
-      if content_type =~ /;\s*charset\s*=\s*"((\\.|[^\\"])+)"/
+      if content_type =~ /;\s*charset\s*=\s*"((\\.|[^\\"])+)"/i
         return $1.gsub(/\\(.)/, '\1')
       end
 

diff --git a/spec/httparty/request_spec.rb b/spec/httparty/request_spec.rb
@@ -248,6 +248,13 @@
         resp.body.encoding.should == Encoding.find("UTF-8")
       end
 
+      it "should process charset in content type properly if it has a different case" do
+        response = stub_response "Content"
+        response.initialize_http_header("Content-Type" => "text/plain;CHARSET = utf-8")
+        resp = @request.perform
+        resp.body.encoding.should == Encoding.find("UTF-8")
+      end
+
       it "should process quoted charset in content type properly" do
         response = stub_response "Content"
         response.initialize_http_header("Content-Type" => "text/plain;charset = \"utf-8\"")