[dovecot-cvs] dovecot/src/login-common ssl-proxy-openssl.c, 1.37.2.4, 1.37.2.5

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot/src/login-common
In directory talvi:/tmp/cvs-serv4097

Modified Files:
      Tag: branch_1_0
	ssl-proxy-openssl.c 
Log Message:
Use SSL_pending() to figure out if we should call SSL_read() again.
Otherwise it breaks..



Index: ssl-proxy-openssl.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/login-common/ssl-proxy-openssl.c,v
retrieving revision 1.37.2.4
retrieving revision 1.37.2.5
diff -u -d -r1.37.2.4 -r1.37.2.5
--- ssl-proxy-openssl.c	23 Jul 2006 23:19:02 -0000	1.37.2.4
+++ ssl-proxy-openssl.c	23 Jul 2006 23:32:09 -0000	1.37.2.5
@@ -371,7 +371,7 @@
 		proxy->ssl_want_size = 0;
 	}
 
-	for (;;) {
+	do {
 		ret = SSL_read(proxy->ssl, buf, size);
 		if (ret <= 0) {
 			ssl_handle_error(proxy, ret, "SSL_read()",
@@ -385,7 +385,7 @@
 
 		if (proxy->sslout_size > 0)
 			ssl_output(proxy);
-	}
+	} while (SSL_pending(proxy->ssl) > 0);
 }
 
 static void ssl_output(struct ssl_proxy *proxy)