get_encoding_from_headers fails if charset name not specified psf#6646

src/requests/utils.py

@@ -549,15 +549,22 @@ def get_encoding_from_headers(headers):
     content_type, params = _parse_content_type_header(content_type)
 
     if "charset" in params:
-        return params["charset"].strip("'\"")
+        charset = params["charset"]
+        if charset is True:  # Check if charset is a boolean value
+            return "ISO-8859-1"
+        elif charset is False:  # Check if charset is explicitly False
+            return None
+        else:
+            return charset.strip("'\"")
 
     if "text" in content_type:
         return "ISO-8859-1"
 
     if "application/json" in content_type:
         # Assume UTF-8 based on RFC 4627: https://www.ietf.org/rfc/rfc4627.txt since the charset was unset
         return "utf-8"
-
+
+    return None
 
 def stream_decode_response_unicode(iterator, r):
     """Stream decodes an iterator."""

tests/test_utils.py

@@ -617,6 +617,8 @@ def test__parse_content_type_header(value, expected):
             "utf-8",
         ),
         (CaseInsensitiveDict({"content-type": "text/plain"}), "ISO-8859-1"),
+        (CaseInsensitiveDict({"content-type": "text/html; charset"}), "ISO-8859-1"),
+        (CaseInsensitiveDict({"content-type": "application/json; charset"}), "ISO-8859-1"),
     ),
 )
 def test_get_encoding_from_headers(value, expected):