From c862e62081763d4ee4b4fe3feb7d9459ac75a398 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sun, 27 Aug 2023 13:34:22 -0500
Subject: [PATCH 1/2] feat: simplify code to unpack properties

---
 src/zeroconf/_services/info.py | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/zeroconf/_services/info.py b/src/zeroconf/_services/info.py
index 705f3723..440a4b9d 100644
--- a/src/zeroconf/_services/info.py
+++ b/src/zeroconf/_services/info.py
@@ -345,31 +345,27 @@ def _set_text(self, text: bytes) -> None:
     def _unpack_text_into_properties(self) -> None:
         """Unpacks the text field into properties"""
         text = self.text
-        end = len(text)
-        if end == 0:
+        if not text:
             # Properties should be set atomically
             # in case another thread is reading them
             self._properties = {}
             return
 
-        result: Dict[Union[str, bytes], Optional[Union[str, bytes]]] = {}
         index = 0
-        strs: List[bytes] = []
+        pairs: List[bytes] = []
+        end = len(text)
         while index < end:
             length = text[index]
             index += 1
-            strs.append(text[index : index + length])
+            pairs.append(text[index : index + length])
             index += length
 
-        for s in strs:
-            key, _, value = s.partition(b'=')
-            # Only update non-existent properties
-            if key and key not in result:
-                result[key] = value or None
-
-        # Properties should be set atomically
-        # in case another thread is reading them
-        self._properties = result
+        # Reverse the list so that the first item in the list
+        # is the last item in the text field. This is important
+        # to preserve backwards compatibility where the first
+        # key always wins if the key is seen multiple times.
+        pairs.reverse()
+        self._properties = {key: value or None for key, _, value in (pair.partition(b'=') for pair in pairs)}
 
     def get_name(self) -> str:
         """Name accessor"""

From 05023e09d607307793452377ea67690d8588f401 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sun, 27 Aug 2023 20:53:29 -0500
Subject: [PATCH 2/2] feat: small cleanup to processing incoming DNSService
 records

We should use the record.server_key instead of building it from record.server
---
 src/zeroconf/_services/info.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zeroconf/_services/info.py b/src/zeroconf/_services/info.py
index 440a4b9d..1cae516d 100644
--- a/src/zeroconf/_services/info.py
+++ b/src/zeroconf/_services/info.py
@@ -472,7 +472,7 @@ def _process_record_threadsafe(self, zc: 'Zeroconf', record: DNSRecord, now: flo
             old_server_key = self.server_key
             self.name = record.name
             self.server = record.server
-            self.server_key = record.server.lower()
+            self.server_key = record.server_key
             self.port = record.port
             self.weight = record.weight
             self.priority = record.priority