2005-05-23 [colin] 1.9.11cvs4

	* src/common/socket.c
		Check another special SSL_peek() error.
		Should help wrt bug #728

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 5dd69118a25472e0ce8cdfe9426a0e31c39d54fe..c32fe99e4c2fb2434ccbf1ebcb00a996a6a55418 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,9 @@
+2005-05-23 [colin]     1.9.11cvs4
+
+       * src/common/socket.c
+               Check another special SSL_peek() error.
+               Should help wrt bug #728
+
 2005-05-23 [colin]     1.9.11cvs3
 
        * src/plugins/pgpmime/pgpmime.c

diff --git a/PATCHSETS b/PATCHSETS
index 1afd9124705e30a037d65beb3bc7a9601ccadd36..1bfca62cb6c9f1e6ae3f361427cbce421386f54f 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -492,3 +492,4 @@
 ( cvs diff -u -r 1.150.2.23 -r 1.150.2.24 src/procmsg.c; ) > 1.9.11cvs1.patchset
 ( cvs diff -u -r 1.150.2.24 -r 1.150.2.25 src/procmsg.c; cvs diff -u -r 1.17.2.9 -r 1.17.2.10 src/send_message.c; ) > 1.9.11cvs2.patchset
 ( cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/plugins/pgpmime/pgpmime.c; ) > 1.9.11cvs3.patchset
+( cvs diff -u -r 1.13.2.12 -r 1.13.2.13 src/common/socket.c; ) > 1.9.11cvs4.patchset

diff --git a/configure.ac b/configure.ac
index d6485a11275b588514d4d82baf23efc86f87cab4..3f80047e9af008e37f295e6eeca535954955ca6d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=11
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=3
+EXTRA_VERSION=4
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/common/socket.c b/src/common/socket.c
index 10aa081bbf75246c925da2bbe884174fe3c7f522..ef9ac2761db3bb3711a58251f4544fc8d578fee9 100644 (file)
--- a/src/common/socket.c
+++ b/src/common/socket.c
@@ -1381,6 +1381,9 @@ gint ssl_peek(SSL *ssl, gchar *buf, gint len)
                return -1;
        case SSL_ERROR_ZERO_RETURN:
                return 0;
+       case SSL_ERROR_SYSCALL:
+               g_warning("SSL_peek() returned syscall error. errno=%d\n", errno);
+               return -1;
        default:
                g_warning("SSL_peek() returned error %d, ret = %d\n", err, ret);
                if (ret == 0)