2.3.3 release, with minor safeguards for null headers.

bertjohnson · Dec 14, 2016 · 54f4778 · 54f4778
1 parent c87ce62
commit 54f4778
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 16 deletions.
diff --git a/.travis.yml b/.travis.yml
diff --git a/OpaqueMail.CertHelper/Properties/AssemblyInfo.cs b/OpaqueMail.CertHelper/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.3.2")]
-[assembly: AssemblyFileVersion("2.3.2")]
+[assembly: AssemblyVersion("2.3.3")]
+[assembly: AssemblyFileVersion("2.3.3")]
diff --git a/OpaqueMail.Proxy/Properties/AssemblyInfo.cs b/OpaqueMail.Proxy/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.3.2")]
-[assembly: AssemblyFileVersion("2.3.2")]
+[assembly: AssemblyVersion("2.3.3")]
+[assembly: AssemblyFileVersion("2.3.3")]
diff --git a/OpaqueMail.ProxyService/Properties/AssemblyInfo.cs b/OpaqueMail.ProxyService/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.3.2")]
-[assembly: AssemblyFileVersion("2.3.2")]
+[assembly: AssemblyVersion("2.3.3")]
+[assembly: AssemblyFileVersion("2.3.3")]
diff --git a/OpaqueMail.ProxySettings/Properties/AssemblyInfo.cs b/OpaqueMail.ProxySettings/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.3.2")]
-[assembly: AssemblyFileVersion("2.3.2")]
+[assembly: AssemblyVersion("2.3.3")]
+[assembly: AssemblyFileVersion("2.3.3")]
diff --git a/OpaqueMail.TestClient/Properties/AssemblyInfo.cs b/OpaqueMail.TestClient/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.3.2")]
-[assembly: AssemblyFileVersion("2.3.2")]
+[assembly: AssemblyVersion("2.3.3")]
+[assembly: AssemblyFileVersion("2.3.3")]
diff --git a/OpaqueMail.doxygen b/OpaqueMail.doxygen
@@ -38,7 +38,7 @@ PROJECT_NAME           = "OpaqueMail"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 2.3.2
+PROJECT_NUMBER         = 2.3.3
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

diff --git a/OpaqueMail.nupkg b/OpaqueMail.nupkg
diff --git a/OpaqueMail/Functions.cs b/OpaqueMail/Functions.cs
@@ -483,6 +483,9 @@ public static string Encode(string input, string ContentTransferEncoding)
         /// <returns>Base-64 encoded version of the email header.</returns>
         public static string EncodeMailHeader(string header)
         {
+            if (string.IsNullOrEmpty(header))
+                return "";
+
             bool extendedCharacterFound = false;
             foreach (char headerCharacter in header.ToCharArray())
             {

diff --git a/OpaqueMail/Properties/AssemblyInfo.cs b/OpaqueMail/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.3.2")]
-[assembly: AssemblyFileVersion("2.3.2")]
+[assembly: AssemblyVersion("2.3.3")]
+[assembly: AssemblyFileVersion("2.3.3")]
diff --git a/OpaqueMail/Smtp/SmtpClient.cs b/OpaqueMail/Smtp/SmtpClient.cs
@@ -212,7 +212,7 @@ public async Task SendAsync(MailMessage message)
             message.Headers["Content-Type"] = message.ContentType + (!string.IsNullOrEmpty(message.CharSet) ? "; charset=\"" + message.CharSet + "\"" : "");
 
             // If the body hasn't been processed, handle encoding of extended characters.
-            if (string.IsNullOrEmpty(rawBody))
+            if (string.IsNullOrEmpty(rawBody) && !string.IsNullOrEmpty(message.Body))
             {
                 bool extendedCharacterFound = false;
                 foreach (char headerCharacter in message.Body.ToCharArray())