Author: davide
Date: 2006-12-13 04:32:55 -0500 (Wed, 13 Dec 2006)
New Revision: 69440

Modified:
   trunk/mcs/class/System/System.Net.Mail/MailAddress.cs
   trunk/mcs/class/System/System.Net.Mail/SmtpClient.cs
Log:
MailAddress compliance problem fixed

Modified: trunk/mcs/class/System/System.Net.Mail/MailAddress.cs
===================================================================
--- trunk/mcs/class/System/System.Net.Mail/MailAddress.cs       2006-12-13 
08:40:47 UTC (rev 69439)
+++ trunk/mcs/class/System/System.Net.Mail/MailAddress.cs       2006-12-13 
09:32:55 UTC (rev 69440)
@@ -55,9 +55,7 @@
 
                public MailAddress (string address, string name, Encoding 
displayNameEncoding)
                {
-                       if (!(address [0] == '<' && address [address.Length - 
1] == '>'))
-                               this.address = "<" + address + ">";
-
+                       this.address = address;
                        this.displayName = name;
                        //this.displayNameEncoding = displayNameEncoding;
                }
@@ -108,8 +106,10 @@
                                sb.Append ("\"");
                                sb.Append (DisplayName);
                                sb.Append ("\"");
-                               sb.Append (" ");
-                               sb.Append (Address);
+                               sb.Append (" ");
+                               sb.Append ("<");
+                               sb.Append (Address);
+                               sb.Append (">");
                        }
                        else {
                                sb.Append (Address);

Modified: trunk/mcs/class/System/System.Net.Mail/SmtpClient.cs
===================================================================
--- trunk/mcs/class/System/System.Net.Mail/SmtpClient.cs        2006-12-13 
08:40:47 UTC (rev 69439)
+++ trunk/mcs/class/System/System.Net.Mail/SmtpClient.cs        2006-12-13 
09:32:55 UTC (rev 69440)
@@ -306,7 +306,7 @@
                                from = defaultFrom;
                        
                        // MAIL FROM:
-                       status = SendCommand (Command.MailFrom, from.Address);
+                       status = SendCommand (Command.MailFrom, '<' + 
from.Address + '>');
                        if (IsError (status)) {
                                throw new SmtpException (status.StatusCode, 
status.Description);
                        }
@@ -315,17 +315,17 @@
                        List<SmtpFailedRecipientException> sfre = new 
List<SmtpFailedRecipientException> ();
 
                        for (int i = 0; i < message.To.Count; i ++) {
-                               status = SendCommand (Command.RcptTo, 
message.To [i].Address);
+                               status = SendCommand (Command.RcptTo, '<' + 
message.To [i].Address + '>');
                                if (IsError (status)) 
                                        sfre.Add (new 
SmtpFailedRecipientException (status.StatusCode, message.To [i].Address));
                        }
                        for (int i = 0; i < message.CC.Count; i ++) {
-                               status = SendCommand (Command.RcptTo, 
message.CC [i].Address);
+                               status = SendCommand (Command.RcptTo, '<' + 
message.CC [i].Address + '>');
                                if (IsError (status)) 
                                        sfre.Add (new 
SmtpFailedRecipientException (status.StatusCode, message.CC [i].Address));
                        }
                        for (int i = 0; i < message.Bcc.Count; i ++) {
-                               status = SendCommand (Command.RcptTo, 
message.Bcc [i].Address);
+                               status = SendCommand (Command.RcptTo, '<' + 
message.Bcc [i].Address + '>');
                                if (IsError (status)) 
                                        sfre.Add (new 
SmtpFailedRecipientException (status.StatusCode, message.Bcc [i].Address));
                        }

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to