Patch from Sergio Villar Senín <svillar@igalia.com>: Fix for bug #546444 (Don't...

svn path=/trunk/; revision=9361

diff --git a/camel/ChangeLog b/camel/ChangeLog
index d8ba66c..c429931 100644 (file)
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,11 @@
+2008-08-18  Sergio Villar Senín  <svillar@igalia.com>
+
+       ** Fix for bug #546444
+
+       * camel-tcp-stream-ssl.c (stream_read): Don't loop infinitely when the 
+       network connection is lost while fetching a message, instead exit with 
+       a connection error. 
+
 2008-08-15  Srinivasa Ragavan  <sragavan@novell.com>
 
        * camel/camel-vtrash-folder.c: Make trash/junk close to a normal vee

diff --git a/camel/camel-tcp-stream-ssl.c b/camel/camel-tcp-stream-ssl.c
index 17f08c8..7aac75c 100644 (file)
--- a/camel/camel-tcp-stream-ssl.c
+++ b/camel/camel-tcp-stream-ssl.c
@@ -391,6 +391,7 @@ stream_read (CamelStream *stream, char *buffer, size_t n)
 #else
                                errno = EIO;
 #endif
+                               goto failed;
                        } else if (pollfds[1].out_flags == PR_POLL_READ) {
                                errno = EINTR;
                                goto failed;