Skip to content

Commit de0ff0f

Browse files
zmurjdduncan
authored andcommitted
WL#15130 Socket-level TLS patch #1: class NdbSocket
Post push fix. Make NdbSocket::ssl_readln return 0 on timeout. Change-Id: I4cad95abd319883c16f2c28eff5cf2b6761731d6
1 parent 1cd011a commit de0ff0f

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

storage/ndb/src/common/util/NdbSocket.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,8 @@ int NdbSocket::ssl_readln(int timeout, int * elapsed,
431431
Timer t(elapsed);
432432
result = poll_readable(timeout);
433433
}
434-
if(result <= 0) return -1;
434+
if(result == 0) return 0; // timeout
435+
if(result < 0) return -1;
435436

436437
/* Read until a complete line is available, eof, or timeout */
437438
TlsLineReader reader(*this, buf, len, heldMutex);
@@ -448,6 +449,7 @@ int NdbSocket::ssl_readln(int timeout, int * elapsed,
448449
} while(! (reader.error() || (*elapsed >= timeout)));
449450

450451
Debug_Log("ssl_readln => -1 [ELAPSED: %d]", *elapsed);
452+
if (*elapsed >= timeout) return 0;
451453
return -1;
452454
}
453455

0 commit comments

Comments
 (0)