2010-05-04 Miguel de Icaza <miguel@novell.com>

	* Apply patch from Ted Unangst to fix bug 574049

svn path=/trunk/mcs/; revision=156700

diff --git a/mcs/class/System/System.Net.Mail/ChangeLog b/mcs/class/System/System.Net.Mail/ChangeLog
index ae531429aa16bbb708c681d6157f5fb3d5400f1b..295dd0287f0c585643ff13beb00960a758984f6f 100644 (file)
--- a/mcs/class/System/System.Net.Mail/ChangeLog
+++ b/mcs/class/System/System.Net.Mail/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-04  Miguel de Icaza  <miguel@novell.com>
+
+       * Apply patch from Ted Unangst to fix bug 574049
+
 2010-03-06 Gonzalo Paniagua Javier <gonzalo@novell.com>
 
        * SmtpClient.cs: typo in reply-to header. Thanks to Chris Tomlinson.

diff --git a/mcs/class/System/System.Net.Mail/SmtpClient.cs b/mcs/class/System/System.Net.Mail/SmtpClient.cs
index 8fe2b6ae83df9d688041155c05132b316e178951..59f7c67a43e6e5c30101fa9406417bcfd626711a 100644 (file)
--- a/mcs/class/System/System.Net.Mail/SmtpClient.cs
+++ b/mcs/class/System/System.Net.Mail/SmtpClient.cs
@@ -533,10 +533,10 @@ namespace System.Net.Mail {
                                        from = defaultFrom;
                                
                                SendHeader (HeaderName.Date, DateTime.Now.ToString ("ddd, dd MMM yyyy HH':'mm':'ss zzz", DateTimeFormatInfo.InvariantInfo));
-                               SendHeader (HeaderName.From, from.ToString ());
-                               SendHeader (HeaderName.To, message.To.ToString ());
+                               SendHeader (HeaderName.From, EncodeAddress(from));
+                               SendHeader (HeaderName.To, EncodeAddresses(message.To));
                                if (message.CC.Count > 0)
-                                       SendHeader (HeaderName.Cc, message.CC.ToString ());
+                                       SendHeader (HeaderName.Cc, EncodeAddresses(message.CC));
                                SendHeader (HeaderName.Subject, EncodeSubjectRFC2047 (message));
 
                                foreach (string s in message.Headers.AllKeys)