From: Wilfried Göesgens <willi@citadel.org>
Date: Sun, 14 Jun 2009 19:55:58 +0000 (+0000)
Subject: * fix SSL Reading
X-Git-Tag: v7.86~1064
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=c34eb6d3fb277ebbdd8e6ccb21f061390c2887d9

* fix SSL Reading
---

diff --git a/webcit/tcp_sockets.c b/webcit/tcp_sockets.c
index 53ff1ebce..9d8ee94c4 100644
--- a/webcit/tcp_sockets.c
+++ b/webcit/tcp_sockets.c
@@ -523,27 +523,38 @@ int client_read_to(ParsedHttpHdrs *Hdr, StrBuf *Target, int bytes, int timeout)
 
 #ifdef HAVE_OPENSSL
 	if (is_https) {
-		long bufremain = StrLength(Hdr->ReadBuf) - (Hdr->Pos - ChrPtr(Hdr->ReadBuf));
+		long bufremain;
+
+		if (Hdr->Pos == NULL)
+			Hdr->Pos = ChrPtr(Hdr->ReadBuf);
+		bufremain = StrLength(Hdr->ReadBuf) - (Hdr->Pos - ChrPtr(Hdr->ReadBuf));
+
+		if (bytes < bufremain)
+			bufremain = bytes;
 		StrBufAppendBufPlain(Target, Hdr->Pos, bufremain, 0);
-		Hdr->Pos = NULL;
-		FlushStrBuf(Hdr->ReadBuf);
-
-		while ((StrLength(Hdr->ReadBuf) + StrLength(Target) < bytes) &&
-		       (retval >= 0))
-			retval = client_read_sslbuffer(Hdr->ReadBuf, timeout);
-		if (retval >= 0) {
-			StrBufAppendBuf(Target, Hdr->ReadBuf, 0); /* todo: Buf > bytes? */
+		StrBufCutLeft(Hdr->ReadBuf, bufremain);
+
+		if (bytes > bufremain) 
+		{
+			while ((StrLength(Hdr->ReadBuf) + StrLength(Target) < bytes) &&
+			       (retval >= 0))
+				retval = client_read_sslbuffer(Hdr->ReadBuf, timeout);
+			if (retval >= 0) {
+				StrBufAppendBuf(Target, Hdr->ReadBuf, 0); /* todo: Buf > bytes? */
 #ifdef HTTP_TRACING
-			write(2, "\033[32m", 5);
-			write(2, buf, bytes);
-			write(2, "\033[30m", 5);
+				write(2, "\033[32m", 5);
+				write(2, buf, bytes);
+				write(2, "\033[30m", 5);
 #endif
-			return 1;
-		}
-		else {
-			lprintf(2, "client_read_ssl() failed\n");
-			return -1;
+				return 1;
+			}
+			else {
+				lprintf(2, "client_read_ssl() failed\n");
+				return -1;
+			}
 		}
+		else 
+			return 1;
 	}
 #endif