[geary/cherry-pick-e99115e9] Merge branch 'mjog/1126-dot-stuffing' into 'mainline'




commit b19d021b47405fa925e1fa611e000252dbcab10f
Author: Michael Gratton <mike vee net>
Date:   Thu Jan 28 11:32:10 2021 +0000

    Merge branch 'mjog/1126-dot-stuffing' into 'mainline'
    
    Fix email being sent truncated after a line starting with a dot.
    
    Closes #1126
    
    See merge request GNOME/geary!647
    
    (cherry picked from commit e99115e99f64e7ff35bdeb7ea474076cda5f548c)
    
    1987582b Geary.Smtp.ClientConnection: Documentation fixes
    cc5d4ffa Geary.Smtp.ClientSession: Ensure SMTP data is sent dot-stuffed

 src/engine/smtp/smtp-client-connection.vala | 12 ++++++------
 src/engine/smtp/smtp-client-session.vala    |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/src/engine/smtp/smtp-client-connection.vala b/src/engine/smtp/smtp-client-connection.vala
index 5851aff73..6cc491f34 100644
--- a/src/engine/smtp/smtp-client-connection.vala
+++ b/src/engine/smtp/smtp-client-connection.vala
@@ -110,14 +110,14 @@ internal class Geary.Smtp.ClientConnection : BaseObject, Logging.Source {
     }
 
     /**
-     * Sends a block of data (mail message) by first issuing the DATA command and transmitting
-     * the block if the appropriate response is sent.
+     * Sends a block of data
      *
-     * Dot-stuffing is performed on the data if !already_dotstuffed.  See
-     * [[http://tools.ietf.org/html/rfc2821#section-4.5.2]]
+     * This first issues a DATA command and transmits the block if the
+     * appropriate response is sent.
      *
-     * Returns the final Response of the transaction.  If the ResponseCode is not a successful
-     * completion, the message should not be considered sent.
+     * Returns the final Response of the transaction. If the
+     * ResponseCode is not a successful completion, the message should
+     * not be considered sent.
      */
     public async Response send_data_async(Memory.Buffer data,
                                           GLib.Cancellable? cancellable = null)
diff --git a/src/engine/smtp/smtp-client-session.vala b/src/engine/smtp/smtp-client-session.vala
index 33069afde..f16eb2987 100644
--- a/src/engine/smtp/smtp-client-session.vala
+++ b/src/engine/smtp/smtp-client-session.vala
@@ -215,7 +215,7 @@ public class Geary.Smtp.ClientSession : BaseObject, Logging.Source {
 
         // DATA
         response = yield cx.send_data_async(
-            email.get_rfc822_buffer(), cancellable
+            email.get_rfc822_buffer(SMTP_FORMAT), cancellable
         );
         if (!response.code.is_success_completed())
             response.throw_error("Unable to send message");


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]