+ return (-1);
+ }
+ StrBufAppendBufPlain(buf, sbuf, rlen, 0);
+ return rlen;
+ }
+ return (0);
+}
+
+int client_readline_sslbuffer(StrBuf *Target, StrBuf *Buffer, int timeout)
+{
+ int ntries = 0;
+ const char *pch, *pchs;
+ int rlen, len, retval = 0;
+ CitContext *CCC = CC;
+
+ if (StrLength(Target) > 0) {
+ pchs = ChrPtr(Buffer);
+ pch = strchr(pchs, '\n');
+ if (pch != NULL) {
+ rlen = 0;
+ len = pch - pchs;
+ if (len > 0 && (*(pch - 1) == '\r') )
+ rlen ++;
+ StrBufSub(Target, Buffer, 0, len - rlen);
+ StrBufCutLeft(Buffer, len + 1);
+ return len - rlen;
+ }
+ }
+
+ while ((retval == 0) && (CCC->ssl != NULL)) {
+ pch = NULL;
+ pchs = ChrPtr(Buffer);
+ if (*pchs != '\0')
+ pch = strchr(pchs, '\n');
+ if (pch == NULL) {
+ retval = client_read_sslbuffer(Buffer, timeout);
+ pchs = ChrPtr(Buffer);
+ pch = strchr(pchs, '\n');
+ }
+ if (retval == 0) {
+ sleep(1);
+ ntries ++;
+ }
+ if (ntries > 10)
+ return 0;
+ }
+ if ((retval > 0) && (pch != NULL)) {
+ rlen = 0;
+ len = pch - pchs;
+ if (len > 0 && (*(pch - 1) == '\r') )
+ rlen ++;
+ StrBufSub(Target, Buffer, 0, len - rlen);
+ StrBufCutLeft(Buffer, len + 1);
+ return len - rlen;
+
+ }
+ else
+ return -1;
+}
+
+
+
+int client_read_sslblob(StrBuf *Target, long bytes, int timeout)
+{
+ long bufremain;
+ long baselen;
+ int retval;
+ CitContext *CCC = CC;
+
+ baselen = StrLength(Target);
+
+ if (CCC->Pos == NULL)
+ CCC->Pos = ChrPtr(CCC->ReadBuf);
+ bufremain = StrLength(CCC->ReadBuf) -
+ (CCC->Pos - ChrPtr(CCC->ReadBuf));
+
+ if (bytes < bufremain)
+ bufremain = bytes;
+ StrBufAppendBufPlain(Target, CCC->Pos, bufremain, 0);
+ StrBufCutLeft(CCC->ReadBuf, bufremain);
+
+ if (bytes > bufremain)
+ {
+ while ((StrLength(CCC->ReadBuf) + StrLength(Target) < bytes + baselen) &&
+ (retval >= 0))
+ retval = client_read_sslbuffer(CCC->ReadBuf, timeout);
+ if (retval >= 0) {
+ StrBufAppendBuf(Target, CCC->ReadBuf, 0); /* todo: Buf > bytes? */
+ return 1;
+ }
+ else {
+ return -1;