openssl: Prevent loops on read errors.

diff --git a/src/ChangeLog b/src/ChangeLog
index aacce5d17d2c5248499ec5d24ffc435c96824e94..b938538dc7a54ede2a44a0aa033e8b3223ed8d1a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2011-05-15  Ray Satiro <raysatiro@yahoo.com>
+
+       * openssl.c (openssl_read): Prevent loops on read errors.
+
 2011-04-24  Giuseppe Scrivano  <gscrivano@gnu.org>
 
        * html-url.c: Include "exists.h".

diff --git a/src/openssl.c b/src/openssl.c
index a1b35b21cdb6f6344fc8c0cac837900a7c284c08..02bd2f430c5787dea3ea99a4c6de3b5abd4fc26b 100644 (file)
--- a/src/openssl.c
+++ b/src/openssl.c
@@ -263,8 +263,8 @@ openssl_read (int fd, char *buf, int bufsize, void *arg)
   do
     ret = SSL_read (conn, buf, bufsize);
   while (ret == -1
-             || (SSL_get_error (conn, ret) == SSL_ERROR_SYSCALL
-                 && errno == EINTR));
+         && SSL_get_error (conn, ret) == SSL_ERROR_SYSCALL
+         && errno == EINTR);
 
   return ret;
 }