/pidgin/main: 30cc3ef7c5d3: Fix handling EAGAIN in purple_ssl_re...

Mike Ruprecht cmaiku at gmail.com
Thu Apr 7 13:36:21 EDT 2016


Changeset: 30cc3ef7c5d375aef5afadebad24c4179024759a
Author:	 Mike Ruprecht <cmaiku at gmail.com>
Date:	 2016-03-31 20:18 -0500
Branch:	 purple-ssl-to-gio
URL: https://hg.pidgin.im/pidgin/main/rev/30cc3ef7c5d3

Description:

Fix handling EAGAIN in purple_ssl_read()

This patch fixes EAGAIN being incorrectly detected when receiving
data on an SSL connection using purple_ssl_read().

diffstat:

 libpurple/sslconn.c |  3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diffs (13 lines):

diff --git a/libpurple/sslconn.c b/libpurple/sslconn.c
--- a/libpurple/sslconn.c
+++ b/libpurple/sslconn.c
@@ -322,7 +322,8 @@ purple_ssl_read(PurpleSslConnection *gsc
 			gsc->cancellable, &error);
 
 	if (outlen < 0) {
-		if (outlen == G_IO_ERROR_WOULD_BLOCK) {
+		if (g_error_matches(error, G_IO_ERROR,
+				G_IO_ERROR_WOULD_BLOCK)) {
 			errno = EAGAIN;
 		}
 



More information about the Commits mailing list