From: Wilfried Goesgens <dothebart@citadel.org>
Date: Mon, 5 Dec 2011 23:19:36 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
X-Git-Tag: v8.03~3
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=35dfcef7abc5e7f6c08a5ca0aab44cbe0031231f;hp=307b424c70c4bdf40419da8f5e299c7aed58fcfa

Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
---

diff --git a/webcit/tcp_sockets.c b/webcit/tcp_sockets.c
index c9d053f2f..7db07943d 100644
--- a/webcit/tcp_sockets.c
+++ b/webcit/tcp_sockets.c
@@ -448,7 +448,8 @@ int ClientGetLine(ParsedHttpHdrs *Hdr, StrBuf *Target)
 
 	if (is_https) {
 		int ntries = 0;
-		if (StrLength(Hdr->ReadBuf) > 0) {
+		if (StrLength(Hdr->ReadBuf) > 0)
+		{
 			pchs = ChrPtr(Hdr->ReadBuf);
 			pch = strchr(pchs, '\n');
 			if (pch != NULL) {
@@ -471,6 +472,8 @@ int ClientGetLine(ParsedHttpHdrs *Hdr, StrBuf *Target)
 					retval = client_read_sslbuffer(Hdr->ReadBuf, SLEEPING);
 					pchs = ChrPtr(Hdr->ReadBuf);
 					pch = strchr(pchs, '\n');
+					if (pch == NULL)
+						retval = 0;
 				}
 				if (retval == 0) {
 					sleeeeeeeeeep(1);