Skip to content

Commit e4b3dde

Browse files
committed
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 67d9af1 commit e4b3dde

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
@@ -452,7 +452,8 @@ int NdbSocket::ssl_readln(int timeout, int * elapsed,
452452
Timer t(elapsed);
453453
result = poll_readable(timeout);
454454
}
455-
if(result <= 0) return -1;
455+
if(result == 0) return 0; // timeout
456+
if(result < 0) return -1;
456457

457458
/* Read until a complete line is available, eof, or timeout */
458459
TlsLineReader reader(*this, buf, len, heldMutex);
@@ -469,6 +470,7 @@ int NdbSocket::ssl_readln(int timeout, int * elapsed,
469470
} while(! (reader.error() || (*elapsed >= timeout)));
470471

471472
Debug_Log("ssl_readln => -1 [ELAPSED: %d]", *elapsed);
473+
if (*elapsed >= timeout) return 0;
472474
return -1;
473475
}
474476

0 commit comments

Comments
 (0)