summary refs log tree commit diff
diff options
context:
space:
mode:
authorJosé Joaquín Atria <jjatria@gmail.com>2023-09-18 12:32:01 +0100
committerGitHub <noreply@github.com>2023-09-18 07:32:01 -0400
commit6946209e671ec278d7648434500aeb2639c8c3c3 (patch)
tree5ea7d4b4a1809501894621775cc066daf36945af
parentBump typing-extensions from 4.7.1 to 4.8.0 (#16341) (diff)
downloadsynapse-6946209e671ec278d7648434500aeb2639c8c3c3.tar.xz
Set email charset as utf-8 rather than utf8 (#16329)
-rw-r--r--changelog.d/16329.bugfix1
-rw-r--r--synapse/handlers/send_email.py4
2 files changed, 3 insertions, 2 deletions
diff --git a/changelog.d/16329.bugfix b/changelog.d/16329.bugfix
new file mode 100644
index 0000000000..2f1f7e8ffe
--- /dev/null
+++ b/changelog.d/16329.bugfix
@@ -0,0 +1 @@
+Use standard name for UTF-8 charset in emails.
diff --git a/synapse/handlers/send_email.py b/synapse/handlers/send_email.py
index 4f5fe62fe8..657d9b3559 100644
--- a/synapse/handlers/send_email.py
+++ b/synapse/handlers/send_email.py
@@ -174,8 +174,8 @@ class SendEmailHandler:
         if raw_to == "":
             raise RuntimeError("Invalid 'to' address")
 
-        html_part = MIMEText(html, "html", "utf8")
-        text_part = MIMEText(text, "plain", "utf8")
+        html_part = MIMEText(html, "html", "utf-8")
+        text_part = MIMEText(text, "plain", "utf-8")
 
         multipart_msg = MIMEMultipart("alternative")
         multipart_msg["Subject"] = subject