diff options
author | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2005-04-05 10:55:21 +0000 |
---|---|---|
committer | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2005-04-05 10:55:21 +0000 |
commit | 130f58af6de1b8669c01ee873a4188b2ffd9c4d5 (patch) | |
tree | 91874a0aa5d9b25b3333cf0b323f1bb963ad6631 /src | |
parent | fba3c2429350e98598460ac9e006d92cbc04c554 (diff) |
made a workaround for Gmail SMTP server.
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@201 ee746299-78ed-0310-b773-934348b2243d
Diffstat (limited to 'src')
-rw-r--r-- | src/procheader.c | 2 | ||||
-rw-r--r-- | src/send_message.c | 5 | ||||
-rw-r--r-- | src/socket.c | 18 |
3 files changed, 20 insertions, 5 deletions
diff --git a/src/procheader.c b/src/procheader.c index eff43f48..415bc59c 100644 --- a/src/procheader.c +++ b/src/procheader.c @@ -503,7 +503,7 @@ MsgInfo *procheader_parse_stream(FILE *fp, MsgFlags flags, gboolean full) MsgInfo *msginfo; gchar buf[BUFFSIZE]; - gchar *p, *q; + gchar *p; gchar *hp; HeaderEntry *hentry; gint hnum; diff --git a/src/send_message.c b/src/send_message.c index b2e5bd6b..efe6a66e 100644 --- a/src/send_message.c +++ b/src/send_message.c @@ -412,6 +412,11 @@ static gint send_message_smtp(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp) ac_prefs->tmp_smtp_pass = NULL; } ret = -1; + } else if (session->state == SESSION_EOF && + SMTP_SESSION(session)->state == SMTP_QUIT) { + /* consider EOF right after QUIT successful */ + log_warning("%s\n", _("Connection closed by the remote host.")); + ret = 0; } else if (session->state == SESSION_ERROR || session->state == SESSION_EOF || session->state == SESSION_TIMEOUT || diff --git a/src/socket.c b/src/socket.c index f23dde62..2c337ccb 100644 --- a/src/socket.c +++ b/src/socket.c @@ -990,7 +990,7 @@ gint fd_read(gint fd, gchar *buf, gint len) #if USE_SSL gint ssl_read(SSL *ssl, gchar *buf, gint len) { - gint ret; + gint err, ret; if (SSL_pending(ssl) == 0) { if (fd_check_io(SSL_get_rfd(ssl), G_IO_IN) < 0) @@ -999,14 +999,19 @@ gint ssl_read(SSL *ssl, gchar *buf, gint len) ret = SSL_read(ssl, buf, len); - switch (SSL_get_error(ssl, ret)) { + switch ((err = SSL_get_error(ssl, ret))) { case SSL_ERROR_NONE: return ret; case SSL_ERROR_WANT_READ: case SSL_ERROR_WANT_WRITE: errno = EAGAIN; return -1; + case SSL_ERROR_ZERO_RETURN: + return 0; default: + g_warning("SSL_read() returned error %d, ret = %d\n", err, ret); + if (ret == 0) + return 0; return -1; } } @@ -1233,7 +1238,7 @@ gint sock_puts(SockInfo *sock, const gchar *buf) #if USE_SSL gint ssl_peek(SSL *ssl, gchar *buf, gint len) { - gint ret; + gint err, ret; if (SSL_pending(ssl) == 0) { if (fd_check_io(SSL_get_rfd(ssl), G_IO_IN) < 0) @@ -1242,14 +1247,19 @@ gint ssl_peek(SSL *ssl, gchar *buf, gint len) ret = SSL_peek(ssl, buf, len); - switch (SSL_get_error(ssl, ret)) { + switch ((err = SSL_get_error(ssl, ret))) { case SSL_ERROR_NONE: return ret; case SSL_ERROR_WANT_READ: case SSL_ERROR_WANT_WRITE: errno = EAGAIN; return -1; + case SSL_ERROR_ZERO_RETURN: + return 0; default: + g_warning("SSL_peek() returned error %d, ret = %d\n", err, ret); + if (ret == 0) + return 0; return -1; } } |