2007-12-05 Atsushi Enomoto <atsushi@ximian.com>

	* SmtpClient.cs : fold base64 string at 76 characters.
	  Should fix bug #344974.

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

diff --git a/mcs/class/System/System.Net.Mail/ChangeLog b/mcs/class/System/System.Net.Mail/ChangeLog
index 96e6ea9c16e0fe7a7d87c112f3e5e64f6f5c87ee..622ec5698fcd68a3974803ce86772dc5798429e6 100644 (file)
--- a/mcs/class/System/System.Net.Mail/ChangeLog
+++ b/mcs/class/System/System.Net.Mail/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-05  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * SmtpClient.cs : fold base64 string at 76 characters.
+         Should fix bug #344974.
+
 2007-12-05  Atsushi Enomoto  <atsushi@ximian.com>
 
        * Attachment.cs : use correct TransferEncoding when (Text)Encoding

diff --git a/mcs/class/System/System.Net.Mail/SmtpClient.cs b/mcs/class/System/System.Net.Mail/SmtpClient.cs
index 42e742e20b838168acaa384b5c51628d3b5c2cdd..ff1f7d01e275e9d3b2ee6bc00727559e7d4585cc 100644 (file)
--- a/mcs/class/System/System.Net.Mail/SmtpClient.cs
+++ b/mcs/class/System/System.Net.Mail/SmtpClient.cs
@@ -267,7 +267,7 @@ namespace System.Net.Mail {
                        case TransferEncoding.SevenBit:
                                return body;
                        case TransferEncoding.Base64:
-                               return Convert.ToBase64String (encoding.GetBytes (body));
+                               return Convert.ToBase64String (encoding.GetBytes (body), Base64FormattingOptions.InsertLineBreaks);
                        default:
                                return ToQuotedPrintable (body, encoding);
                        }
@@ -285,7 +285,7 @@ namespace System.Net.Mail {
                        case TransferEncoding.SevenBit:
                                return Encoding.ASCII.GetString (bytes);
                        case TransferEncoding.Base64:
-                               return Convert.ToBase64String (bytes);
+                               return Convert.ToBase64String (bytes, Base64FormattingOptions.InsertLineBreaks);
                        default:
                                return ToQuotedPrintable (bytes);
                        }
@@ -997,12 +997,12 @@ try {
                                throw new SmtpException (status.StatusCode, status.Description);
                        }
 
-                       status = SendCommand (Convert.ToBase64String (Encoding.ASCII.GetBytes (Username)));
+                       status = SendCommand (Convert.ToBase64String (Encoding.ASCII.GetBytes (Username), Base64FormattingOptions.InsertLineBreaks));
                        if (((int) status.StatusCode) != 334) {
                                throw new SmtpException (status.StatusCode, status.Description);
                        }
 
-                       status = SendCommand (Convert.ToBase64String (Encoding.ASCII.GetBytes (Password)));
+                       status = SendCommand (Convert.ToBase64String (Encoding.ASCII.GetBytes (Password), Base64FormattingOptions.InsertLineBreaks));
                        if (IsError (status)) {
                                throw new SmtpException (status.StatusCode, status.Description);
                        }