adium 5842:f8d2f42c499b: Backed out ef796c40efb0: the code can c...

commits at adium.im commits at adium.im
Fri Feb 21 10:54:32 UTC 2014


details:	http://hg.adium.im/adium/rev/f8d2f42c499b
revision:	5842:f8d2f42c499b
branch:		adium-1.5.10
author:		Thijs Alkemade <me at thijsalkema.de>
date:		Fri Feb 21 11:53:35 2014 +0100

Backed out ef796c40efb0: the code can cause busy loops on disconnect, especially with XMPP servers (in particular when prompted to enter a password).

Reverting this change until we have found the exact cause.

Refs #16356, fixes #16431

diffs (25 lines):

diff -r 358ce0202729 -r f8d2f42c499b Plugins/Purple Service/libpurple_extensions/ssl-cdsa.c
--- a/Plugins/Purple Service/libpurple_extensions/ssl-cdsa.c	Fri Feb 21 11:44:12 2014 +0100
+++ b/Plugins/Purple Service/libpurple_extensions/ssl-cdsa.c	Fri Feb 21 11:53:35 2014 +0100
@@ -236,18 +236,17 @@
             switch(theErr) {
                 case ENOENT:
                     /* connection closed */
-                    rtn = errSSLClosedGraceful;
+                    rtn = errSSLClosedGraceful; 
                     break;
                 case ECONNRESET:
                     rtn = errSSLClosedAbort;
                     break;
-				case 0:
                 case EAGAIN:
                     rtn = errSSLWouldBlock;
                     break;
                 default:
-                    fprintf(stderr,"SocketRead: read(%lu) error %d\n",
-							(unsigned long)bytesToGo, theErr);
+                    fprintf(stderr,"SocketRead: read(%lu) error %d\n", 
+                             (unsigned long)bytesToGo, theErr);
                     rtn = errSSLFatalAlert;
                     break;
             }




More information about the commits mailing list