Merge branch '2.1' into develop

2017-07-24 12:37:25 +03:00
parent 4bb4b921cb f76e4cd61d
commit 26bf342e6b
21 changed files with 111 additions and 42 deletions
--- a/server/core/server.cc
+++ b/server/core/server.cc
@ -1213,10 +1213,11 @@ static bool create_server_config(const SERVER *server, const char *filename)

        switch (server->server_ssl->ssl_method_type)
        {
+#ifndef OPENSSL_1_1
        case SERVICE_TLS10:
            version = "TLSV10";
            break;
-
+#endif
 #ifdef OPENSSL_1_0
        case SERVICE_TLS11:
            version = "TLSV11";