From 3d32b8fe2dfb903606946965bdfd88c27629be39 Mon Sep 17 00:00:00 2001
From: Torben Dannhauer <torben@dannhauer.de>
Date: Mon, 30 Mar 2026 18:23:38 +0200
Subject: [PATCH 1/2] Update exception handling to use namespace

---
 lib/Horde/Mime/Headers/Deprecated.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Horde/Mime/Headers/Deprecated.php b/lib/Horde/Mime/Headers/Deprecated.php
index 913457e..ff88894 100644
--- a/lib/Horde/Mime/Headers/Deprecated.php
+++ b/lib/Horde/Mime/Headers/Deprecated.php
@@ -90,7 +90,7 @@ public function addReceivedHeader(array $opts = array())
                             }
                         }
                     }
-                } catch (Net_DNS2_Exception $e) {
+                } catch (\NetDNS2\Exception $e) {
                 }
             } else {
                 $remote = gethostbyaddr($remote_addr);
@@ -109,7 +109,7 @@ public function addReceivedHeader(array $opts = array())
                                 }
                             }
                         }
-                    } catch (Net_DNS2_Exception $e) {
+                    } catch (\NetDNS2\Exception $e) {
                     }
                 } else {
                     $remote = gethostbyaddr($remote_addr);

From d47b9a646847b9b93acb7550df46f500664b3bbf Mon Sep 17 00:00:00 2001
From: Torben Dannhauer <torben@dannhauer.de>
Date: Mon, 30 Mar 2026 19:12:32 +0200
Subject: [PATCH 2/2] Refactor exception handling for NetDNS2

---
 lib/Horde/Mime/Headers/Deprecated.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/Horde/Mime/Headers/Deprecated.php b/lib/Horde/Mime/Headers/Deprecated.php
index ff88894..7e2b4ce 100644
--- a/lib/Horde/Mime/Headers/Deprecated.php
+++ b/lib/Horde/Mime/Headers/Deprecated.php
@@ -12,6 +12,8 @@
  * @package   Mime
  */
 
+use NetDNS2\Exception as NetDNS2Exception;
+
 /**
  * Deprecated Horde_Mime_Headers methods.
  *
@@ -90,7 +92,7 @@ public function addReceivedHeader(array $opts = array())
                             }
                         }
                     }
-                } catch (\NetDNS2\Exception $e) {
+                } catch (NetDNS2Exception $e) {
                 }
             } else {
                 $remote = gethostbyaddr($remote_addr);
@@ -109,7 +111,7 @@ public function addReceivedHeader(array $opts = array())
                                 }
                             }
                         }
-                    } catch (\NetDNS2\Exception $e) {
+                    } catch (NetDNS2Exception $e) {
                     }
                 } else {
                     $remote = gethostbyaddr($remote_addr);