forked from pool/fetchmail
65 lines
1.7 KiB
Diff
65 lines
1.7 KiB
Diff
Author: m-a
|
|
Date: 2007-02-02 18:13:12 -0600 (Fri, 02 Feb 2007)
|
|
New Revision: 5022
|
|
|
|
Modified:
|
|
branches/BRANCH_6-3/NEWS
|
|
branches/BRANCH_6-3/pop3.c
|
|
Log:
|
|
Fix 6.3.6 regression: repoll upon socket error after STLS failure.
|
|
Berlios Bug #10133, reported by Andrej Kacian.
|
|
|
|
# FIXES FOR REGRESSIONS IN 6.3.6
|
|
* Fix KPOP. Patch by Miloslav Trmac.
|
|
* Fix repoll when server disconnects after opportunistic TLS failed for POP3.
|
|
Berlios Bug #10133, reported by Andrej Kacian.
|
|
|
|
Modified: branches/BRANCH_6-3/pop3.c
|
|
===================================================================
|
|
--- branches/BRANCH_6-3/pop3.c 2007-02-02 23:47:15 UTC (rev 5021)
|
|
+++ branches/BRANCH_6-3/pop3.c 2007-02-03 00:13:12 UTC (rev 5022)
|
|
@@ -635,17 +635,6 @@
|
|
}
|
|
memset(shroud, 0x55, sizeof(shroud));
|
|
shroud[0] = '\0';
|
|
-#ifdef SSL_ENABLE
|
|
- /* this is for servers which claim to support TLS, but actually
|
|
- * don't! */
|
|
- if (connection_may_have_tls_errors && ok == PS_SOCKET)
|
|
- {
|
|
- xfree(ctl->sslproto);
|
|
- ctl->sslproto = xstrdup("");
|
|
- /* repoll immediately without TLS */
|
|
- ok = PS_REPOLL;
|
|
- }
|
|
-#endif
|
|
break;
|
|
|
|
case P_APOP:
|
|
@@ -694,6 +683,18 @@
|
|
ok = PS_ERROR;
|
|
}
|
|
|
|
+#ifdef SSL_ENABLE
|
|
+ /* this is for servers which claim to support TLS, but actually
|
|
+ * don't! */
|
|
+ if (connection_may_have_tls_errors && ok == PS_SOCKET)
|
|
+ {
|
|
+ xfree(ctl->sslproto);
|
|
+ ctl->sslproto = xstrdup("");
|
|
+ /* repoll immediately without TLS */
|
|
+ ok = PS_REPOLL;
|
|
+ }
|
|
+#endif
|
|
+
|
|
if (ok != 0)
|
|
{
|
|
/* maybe we detected a lock-busy condition? */
|
|
|
|
_______________________________________________
|
|
fetchmail-svn mailing list
|
|
fetchmail-svn@lists.berlios.de
|
|
https://lists.berlios.de/mailman/listinfo/fetchmail-svn
|
|
|
|
|