revert last change, as the one before seems to work and doesn't require the select trick.
never assume a bug in a release isn't fixed in HEAD :) git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@13891 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -926,13 +926,10 @@ SMTPProtocol::ReceiveResponse(BString &out)
|
|||||||
BString searchStr = "";
|
BString searchStr = "";
|
||||||
|
|
||||||
struct timeval tv;
|
struct timeval tv;
|
||||||
struct timeval nulltv;
|
|
||||||
struct fd_set fds;
|
struct fd_set fds;
|
||||||
|
|
||||||
tv.tv_sec = long(timeout / 1e6);
|
tv.tv_sec = long(timeout / 1e6);
|
||||||
tv.tv_usec = long(timeout-(tv.tv_sec * 1e6));
|
tv.tv_usec = long(timeout-(tv.tv_sec * 1e6));
|
||||||
nulltv.tv_sec = 0L;
|
|
||||||
nulltv.tv_usec = 0L;
|
|
||||||
|
|
||||||
/* Initialize (clear) the socket mask. */
|
/* Initialize (clear) the socket mask. */
|
||||||
FD_ZERO(&fds);
|
FD_ZERO(&fds);
|
||||||
@@ -972,16 +969,6 @@ SMTPProtocol::ReceiveResponse(BString &out)
|
|||||||
|
|
||||||
len += r;
|
len += r;
|
||||||
out.Append(buf, r);
|
out.Append(buf, r);
|
||||||
|
|
||||||
// is there anything else to read ? (smtp.1und1.de sends the 250-AUTH line in a 2nd part)
|
|
||||||
#ifdef USESSL
|
|
||||||
if ((use_ssl) && (SSL_pending(ssl)))
|
|
||||||
continue;
|
|
||||||
else
|
|
||||||
#endif
|
|
||||||
result = select(32, &fds, NULL, NULL, &nulltv);
|
|
||||||
if (result > 0)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
if (strstr(buf, CRLF) && (out.FindFirst(searchStr) != B_ERROR))
|
if (strstr(buf, CRLF) && (out.FindFirst(searchStr) != B_ERROR))
|
||||||
break;
|
break;
|
||||||
|
|||||||
Reference in New Issue
Block a user