[Libreoffice-commits] online.git: Branch 'private/Ashod/nonblocking' - net/ssl.cpp

[Ashod Nakashian]

 net/ssl.cpp |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit b0cf7e5d58cbb105bf9fad36d5262e7db0ccd6e8
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Fri Feb 17 18:09:55 2017 -0500

    nb: Enable partial writes and no retry
    
    Change-Id: I75567754b81cc43190087bae4f848a0742201fe0
    Reviewed-on: https://gerrit.libreoffice.org/34390
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/net/ssl.cpp b/net/ssl.cpp
index 1d56f6a..a1f23a1 100644
--- a/net/ssl.cpp
+++ b/net/ssl.cpp
@@ -94,7 +94,7 @@ SslContext::SslContext(const std::string& certFilePath,
         SSL_CTX_set_verify(_ctx, SSL_VERIFY_NONE, nullptr /*&verifyServerCallback*/);
         SSL_CTX_set_cipher_list(_ctx, "ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH");
         SSL_CTX_set_verify_depth(_ctx, 9);
-        SSL_CTX_set_mode(_ctx, SSL_MODE_AUTO_RETRY);
+        SSL_CTX_set_mode(_ctx, SSL_MODE_ENABLE_PARTIAL_WRITE);
         SSL_CTX_set_session_cache_mode(_ctx, SSL_SESS_CACHE_OFF);
 
         initDH();
@@ -103,6 +103,7 @@ SslContext::SslContext(const std::string& certFilePath,
     catch (...)
     {
         SSL_CTX_free(_ctx);
+        _ctx = nullptr;
         throw;
     }
 }