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

Complete TLS merge

Browse Source 
Former-commit-id: 856d23023259d59ce766e9cd00526de0e7d06c2f
This commit is contained in:
John Sully 2020-05-26 01:38:29 -04:00
parent f617eafbe1
commit ef32f81fd9
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/tls.cpp
View File

@ -898,10 +898,7 @@ ConnectionType CT_TLS = {
connTLSSyncWrite, connTLSSyncWrite,
connTLSSyncRead, connTLSSyncRead,
connTLSSyncReadLine, connTLSSyncReadLine,
<<<<<<< HEAD
=======
connTLSMarshalThread, connTLSMarshalThread,
>>>>>>> unstable
}; };
int tlsHasPendingData() { int tlsHasPendingData() {