Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions common/thorhelper/thorsoapcall.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2255,22 +2255,25 @@ class CWSCAsyncFor : implements IWSCAsyncFor, public CInterface, public CAsyncFo
{
while (read<payloadsize)
{
checkTimeLimitExceeded(&remainingMS);
checkRoxieAbortMonitor(master->roxieAbortMonitor);
sockClosed = readtmsAllowClose(socket, response.reserve(payloadsize-read), 1, payloadsize-read, bytesRead, MIN(master->timeoutMS, remainingMS));
checkTimeLimitExceeded(&remainingMS);
checkRoxieAbortMonitor(master->roxieAbortMonitor);

read += bytesRead;
response.setLength(read);
bytesRead = 0;
if (!sockClosed)
{
checkTimeLimitExceeded(&remainingMS);
checkRoxieAbortMonitor(master->roxieAbortMonitor);
sockClosed = readtmsAllowClose(socket, response.reserve(payloadsize-read), 1, payloadsize-read, bytesRead, MIN(master->timeoutMS, remainingMS));
checkTimeLimitExceeded(&remainingMS);
checkRoxieAbortMonitor(master->roxieAbortMonitor);
read += bytesRead;
response.setLength(read);
}
if ( (bytesRead==0) || (sockClosed && (read < payloadsize)) )
{
master->logctx.CTXLOG("%s: Warning %sHTTP response terminated prematurely", getWsCallTypeName(master->wscType),chunked?"CHUNKED ":"");
break; // oops looks likesocket closed early
}
}
}
else
else if (!sockClosed)
{
for (;;)
{
Expand Down
2 changes: 1 addition & 1 deletion dali/base/dadfs.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ enum MDFSRequestKind
MDFS_SET_FILE_PROTECT,
MDFS_ITERATE_FILTEREDFILES,
MDFS_ITERATE_FILTEREDFILES2,
MDFS_ITERATE_FILTEREDFILES3,
MDFS_GET_FILE_TREE2,
MDFS_ITERATE_FILTEREDFILES3,
MDFS_MAX
};

Expand Down
Loading
Loading