`Reply-To: <>` header generated when [notification] smtp_replyto is empty

[Jun Omae]

The Reply-To should be omitted when [notification] smtp_replyto is empty.

Content-Type: multipart/related;
 boundary="===============7984323936476389257=="
MIME-Version: 1.0
X-Mailer: Trac 1.6.1.dev0, by Edgewall Software
X-Trac-Version: 1.6.1.dev0
X-Trac-Project: My Project
X-URL:
X-Trac-Realm: test
Precedence: bulk
Auto-Submitted: auto-generated
Message-ID: <073.33b09254542a2586acff57f1bbef6f10@example.org>
Date: Fri, 19 Jul 2024 03:10:05 -0000
To: undisclosed-recipients: ;
From: My Project <trac@example.org>
Cc: cc@example.org
Reply-To: <>

--===============7984323936476389257==
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit

blah

--===============7984323936476389257==--

Patch:

trac/notification/mail.py

@@ -646 +646 @@
             set_header(message, 'Cc', addresses=cc_addrs)
         if bcc_addrs:
             set_header(message, 'Bcc', addresses=bcc_addrs)
-        set_header(message, 'Reply-To', addresses=[smtp_replyto])
+        if smtp_replyto:
+            set_header(message, 'Reply-To', addresses=[smtp_replyto])
 
         for decorator in self.decorators:
             decorator.decorate_message(event, message, self._charset)

trac/notification/tests/mail.py

@@ -509 +509 @@
         self._assert_equal_sets(['cc@example.org'],
                                 self._cclist(message['Cc']))
 
+    def test_replyto(self):
+        config = self.env.config
+        config.set('notification', 'smtp_replyto', 'replyto@example.org')
+        self._notify_event('blah')
+        history = self.sender.history
+        from_addr, recipients, message = history[0]
+        self.assertEqual('replyto@example.org', message['Reply-To'])
+
+    def test_replyto_empty(self):
+        config = self.env.config
+        config.set('notification', 'smtp_replyto', '')
+        self._notify_event('blah')
+        history = self.sender.history
+        from_addr, recipients, message = history[0]
+        self.assertNotIn('Reply-To', message)
+
 
 class RecipientMatcherTestCase(unittest.TestCase):