From 928107e0fedd80ae98042d587341da4739ebba8f Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Fri, 4 Mar 2005 14:34:04 +0000 Subject: [PATCH] 2005-03-04 [colin] 1.0.1cvs22.1 * src/common/smtp.c * src/common/smtp.h Don't use SIZE param in MAIL FROM: if server doesn't support it. Patch by Eugen Freiter --- ChangeLog-gtk2.claws | 8 ++++++++ PATCHSETS | 1 + configure.ac | 2 +- src/common/smtp.c | 4 +++- src/common/smtp.h | 1 + 5 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index 83baaa06b..6bf6dc9e8 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -1,3 +1,11 @@ +2005-03-04 [colin] 1.0.1cvs22.1 + + * src/common/smtp.c + * src/common/smtp.h + Don't use SIZE param in MAIL FROM: if server + doesn't support it. Patch by Eugen Freiter + + 2005-02-27 [paul] 1.0.1cvs20.1 * ChangeLog.claws diff --git a/PATCHSETS b/PATCHSETS index cb71cb13e..8b95b8b60 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -406,3 +406,4 @@ ( cvs diff -u -r 1.382.2.108 -r 1.382.2.109 src/compose.c; ) > 1.0.1cvs19.3.patchset ( cvs diff -u -r 1.47.2.15 -r 1.47.2.16 src/procheader.c; cvs diff -u -r 1.11.2.2 -r 1.11.2.3 src/procheader.h; ) > 1.0.1cvs19.4.patchset ( cvs diff -u -r 1.2504.2.50 -r 1.2504.2.51 ChangeLog.claws; cvs diff -u -r 1.654.2.441 -r 1.654.2.442 configure.ac; cvs diff -u -r 1.94.2.47 -r 1.94.2.48 src/messageview.c; ) > 1.0.1cvs20.1.patchset +( cvs diff -u -r 1.11.2.8 -r 1.11.2.9 src/common/smtp.c; cvs diff -u -r 1.6.2.4 -r 1.6.2.5 src/common/smtp.h; ) > 1.0.1cvs22.1.patchset diff --git a/configure.ac b/configure.ac index 1d50b29bd..a8a34e9c7 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=0 MICRO_VERSION=1 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=20 +EXTRA_VERSION=22 EXTRA_RELEASE= EXTRA_GTK2_VERSION=.1 diff --git a/src/common/smtp.c b/src/common/smtp.c index b064bf249..23087b5f0 100644 --- a/src/common/smtp.c +++ b/src/common/smtp.c @@ -96,6 +96,7 @@ Session *smtp_session_new(void) session->avail_auth_type = 0; session->forced_auth_type = 0; session->auth_type = 0; + session->esmtp_flags = 0; session->error_val = SM_OK; session->error_msg = NULL; @@ -126,7 +127,7 @@ static gint smtp_from(SMTPSession *session) session->state = SMTP_FROM; - if (session->is_esmtp) + if (session->is_esmtp && (session->esmtp_flags & ESMTP_SIZE)!=0) mail_size = g_strdup_printf(" SIZE=%d", session->send_data_len); else mail_size = g_strdup(""); @@ -299,6 +300,7 @@ static gint smtp_ehlo_recv(SMTPSession *session, const gchar *msg) if (g_ascii_strncasecmp(p, "SIZE", 4) == 0) { p += 5; session->max_message_size = atoi(p); + session->esmtp_flags |= ESMTP_SIZE; } return SM_OK; } else if ((msg[0] == '1' || msg[0] == '2' || msg[0] == '3') && diff --git a/src/common/smtp.h b/src/common/smtp.h index 5ca3d39c4..642919c58 100644 --- a/src/common/smtp.h +++ b/src/common/smtp.h @@ -114,6 +114,7 @@ struct _SMTPSession SMTPErrorValue error_val; gchar *error_msg; gboolean is_esmtp; + ESMTPFlag esmtp_flags; }; Session *smtp_session_new (void); -- 2.25.1