From 1987582bca97f3200dbb7d071ca7c62ede893832 Mon Sep 17 00:00:00 2001 From: Michael Gratton Date: Thu, 28 Jan 2021 22:09:43 +1100 Subject: [PATCH 1/2] Geary.Smtp.ClientConnection: Documentation fixes --- src/engine/smtp/smtp-client-connection.vala | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/engine/smtp/smtp-client-connection.vala b/src/engine/smtp/smtp-client-connection.vala index 5851aff7..6cc491f3 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) From cc5d4ffa623621689eafb41e626cdc01b2599af8 Mon Sep 17 00:00:00 2001 From: Michael Gratton Date: Thu, 28 Jan 2021 22:10:03 +1100 Subject: [PATCH 2/2] Geary.Smtp.ClientSession: Ensure SMTP data is sent dot-stuffed Fixes #1126 --- src/engine/smtp/smtp-client-session.vala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/engine/smtp/smtp-client-session.vala b/src/engine/smtp/smtp-client-session.vala index 33069afd..f16eb298 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");