Ticket #13570: ticket13570.diff

django/core/mail/utils.py

@@ -13 +13 @@
 
     def get_fqdn(self):
         if not hasattr(self, '_fqdn'):
-            self._fqdn = socket.getfqdn()
+            fqdn = socket.getfqdn()
+            if '.' in fqdn:
+                self._fqdn = fqdn
+            else:
+                # logic from smtplib -- use domain literal if no fqdn can be found
+                addr = '127.0.0.1'
+                try:
+                    addr = socket.gethostbyname(socket.gethostname())
+                except socket.gaierror:
+                    pass
+                self._fqdn = '[%s]' % addr
+
         return self._fqdn
 
 DNS_NAME = CachedDnsName()