fix ssl deadlock, when peer closes connection

diff --git a/ChangeLog.claws b/ChangeLog.claws
index e830eaa6de42d01339621260531f3d21278e539a..533f6cf97253265ebced73b38acc77a2c0ba9453 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2001-10-24 [christoph] 0.6.4claws3
+
+       * src/socket.c
+               fix ssl deadlock, when peer closes connection
+
 2001-10-24 [paul]      0.6.4claws2
 
        * src/prefs_common.c

diff --git a/configure.in b/configure.in
index ad7b2b1ec915b01b6a6f9d690f860df9a4a2f3a6..eb49e7e473198aea499546515b5eb443d2ae1e79 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=6
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws2
+EXTRA_VERSION=claws3
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl

diff --git a/src/socket.c b/src/socket.c
index acd7192b8cef77df6bbd6f7d854ea98be2d1a3fa..e0b5f20131ecf96930504bb5feb7cfb786d730a7 100644 (file)
--- a/src/socket.c
+++ b/src/socket.c
@@ -455,7 +455,7 @@ gint ssl_gets(SSL *ssl, gchar *buf, gint len)
                return -1;
        while (len > 0 && !newline) {
                *bp = '\0';
-               if ((n = SSL_read(ssl, bp, 1)) < 0)
+               if ((n = SSL_read(ssl, bp, 1)) <= 0)
                        return -1;
                if (*bp == '\n')
                        newline = TRUE;