From 0ae40dbdfd2afbcb2d76b041fb7c05e531fbcc2f Mon Sep 17 00:00:00 2001
From: Tobias Brox <tobias@redpill-linpro.com>
Date: Wed, 27 Nov 2024 06:29:13 +0100
Subject: [PATCH] attempt on solving
 https://github.com/python-caldav/caldav/issues/458 - use
 requests.CaseInsensitiveDict everywhere

---
 caldav/davclient.py | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/caldav/davclient.py b/caldav/davclient.py
index 4da3e6b..f6b6f8e 100644
--- a/caldav/davclient.py
+++ b/caldav/davclient.py
@@ -378,7 +378,7 @@ def __init__(
         timeout: Optional[int] = None,
         ssl_verify_cert: Union[bool, str] = True,
         ssl_cert: Union[str, Tuple[str, str], None] = None,
-        headers: Dict[str, str] = None,
+        headers: Mapping[str, str] = None,
         huge_tree: bool = False,
     ) -> None:
         """
@@ -396,8 +396,6 @@ def __init__(
         username and password may be omitted.  Known bug: .netrc is honored
         even if a username/password is given, ref https://github.com/python-caldav/caldav/issues/206
         """
-        headers = headers or {}
-
         self.session = niquests.Session(multiplexed=True)
 
         log.debug("url: " + str(url))
@@ -421,12 +419,12 @@ def __init__(
             self.proxy = _proxy
 
         # Build global headers
-        self.headers = {
+        self.headers = CaseInsensitiveDict({
             "User-Agent": "python-caldav/" + __version__,
             "Content-Type": "text/xml",
             "Accept": "text/xml, text/calendar",
-        }
-        self.headers.update(headers)
+        })
+        self.headers.update(headers or {})
         if self.url.username is not None:
             username = unquote(self.url.username)
             password = unquote(self.url.password)
@@ -640,7 +638,7 @@ def request(
         headers = headers or {}
 
         combined_headers = self.headers.copy()
-        combined_headers.update(headers)
+        combined_headers.update(headers or {})
         if (body is None or body == "") and "Content-Type" in combined_headers:
             del combined_headers["Content-Type"]
 
@@ -691,13 +689,15 @@ def request(
             if not r.status_code == 401:
                 raise
 
+        ## Returned headers
+        r_headers = CaseInsensitiveDict(r.headers)
         if (
             r.status_code == 401
-            and "WWW-Authenticate" in r.headers
+            and "WWW-Authenticate" in r_headers
             and not self.auth
             and self.username
         ):
-            auth_types = self.extract_auth_types(r.headers["WWW-Authenticate"])
+            auth_types = self.extract_auth_types(r_headers["WWW-Authenticate"])
 
             if self.password and self.username and "digest" in auth_types:
                 self.auth = niquests.auth.HTTPDigestAuth(self.username, self.password)
@@ -715,7 +715,7 @@ def request(
 
         elif (
             r.status_code == 401
-            and "WWW-Authenticate" in r.headers
+            and "WWW-Authenticate" in r_headers
             and self.auth
             and self.password
             and isinstance(self.password, bytes)
@@ -729,7 +729,7 @@ def request(
             ## sequence and not a string (see commit 13a4714, which
             ## introduced this regression)
 
-            auth_types = self.extract_auth_types(r.headers["WWW-Authenticate"])
+            auth_types = self.extract_auth_types(r_headers["WWW-Authenticate"])
 
             if self.password and self.username and "digest" in auth_types:
                 self.auth = niquests.auth.HTTPDigestAuth(