Fix a bug when sending large messages using SSL (#42)

Author: an-tao

trantor/net/inner/TcpConnectionImpl.cc

@@ -700,7 +700,7 @@ void TcpConnectionImpl::sendFileInLoop(const BufferNodePtr &filePtr)
         if (n > 0)
         {
             auto nSend = writeInLoop(&buf[0], n);
-            if (nSend > 0)
+            if (nSend >= 0)
             {
                 filePtr->_fileBytesToSend -= nSend;
                 filePtr->_offset += nSend;
@@ -715,8 +715,6 @@ void TcpConnectionImpl::sendFileInLoop(const BufferNodePtr &filePtr)
                 else if (nSend == n)
                     continue;
             }
-            if (nSend == 0)
-                return;
             if (nSend < 0)
             {
                 if (errno != EWOULDBLOCK)

trantor/net/ssl/SSLConnection.cc

@@ -239,7 +239,7 @@ void SSLConnection::doHandshaking()
     else
     {
         // ERR_print_errors(err);
-        LOG_DEBUG << "SSL handshake err: " << err;
+        LOG_TRACE << "SSL handshake err: " << err;
         _ioChannelPtr->disableReading();
         _status = SSLStatus::DisConnected;
         forceClose();
@@ -263,11 +263,15 @@ ssize_t SSLConnection::writeInLoop(const char *buffer, size_t length)
 
     // send directly
     auto sendLen = SSL_write(_sslPtr->get(), buffer, length);
-    int sslerr = SSL_get_error(_sslPtr->get(), sendLen);
-    if (sendLen < 0 && sslerr != SSL_ERROR_WANT_WRITE)
+    if (sendLen <= 0)
     {
-        LOG_ERROR << "ssl write error:" << sslerr;
-        return -1;
+        int sslerr = SSL_get_error(_sslPtr->get(), sendLen);
+        if (sslerr != SSL_ERROR_WANT_WRITE && sslerr != SSL_ERROR_WANT_READ)
+        {
+            LOG_ERROR << "ssl write error:" << sslerr;
+            return -1;
+        }
+        return 0;
     }
     return sendLen;
 }