gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix TLS test failure

Browse Source 
Former-commit-id: 57ca6facc3038e005656912b6378cb7fbe04f55a
This commit is contained in:
John Sully 2020-05-28 23:13:15 -04:00
parent d9164a07b5
commit 71fbeb65b6
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/server.cpp
View File

@ -2197,7 +2197,9 @@ void beforeSleep(struct aeEventLoop *eventLoop) {
handleBlockedClientsTimeout(); handleBlockedClientsTimeout();
/* Handle TLS pending data. (must be done before flushAppendOnlyFile) */ /* Handle TLS pending data. (must be done before flushAppendOnlyFile) */
aeReleaseLock();
tlsProcessPendingData(); tlsProcessPendingData();
aeAcquireLock();
/* If tls still has pending unread data don't sleep at all. */ /* If tls still has pending unread data don't sleep at all. */
aeSetDontWait(eventLoop, tlsHasPendingData()); aeSetDontWait(eventLoop, tlsHasPendingData());

2
src/tls.cpp
View File

@ -458,7 +458,6 @@ void updateSSLEvent(tls_connection *conn) {
void tlsHandleEvent(tls_connection *conn, int mask) { void tlsHandleEvent(tls_connection *conn, int mask) {
int ret; int ret;
serverAssert(!GlobalLocksAcquired());
serverAssert(conn->el == serverTL->el); serverAssert(conn->el == serverTL->el);
TLSCONN_DEBUG("tlsEventHandler(): fd=%d, state=%d, mask=%d, r=%d, w=%d, flags=%d", TLSCONN_DEBUG("tlsEventHandler(): fd=%d, state=%d, mask=%d, r=%d, w=%d, flags=%d",
@ -910,6 +909,7 @@ int tlsHasPendingData() {
int tlsProcessPendingData() { int tlsProcessPendingData() {
listIter li; listIter li;
listNode *ln; listNode *ln;
serverAssert(!GlobalLocksAcquired());
int processed = listLength(pending_list); int processed = listLength(pending_list);
listRewind(pending_list,&li); listRewind(pending_list,&li);