Merge branch '2.2' into develop

2018-03-06 17:02:03 +02:00
parent 8232c5d449 78abfd67e6
commit d6b8147119
13 changed files with 256 additions and 145 deletions
--- a/server/modules/protocol/MySQL/mysql_common.cc
+++ b/server/modules/protocol/MySQL/mysql_common.cc
@ -1376,7 +1376,7 @@ mxs_auth_state_t gw_send_backend_auth(DCB *dcb)
                                              with_ssl, ssl_established);
    ss_dassert(buffer);

-    if (with_ssl)
+    if (with_ssl && !ssl_established)
    {
        if (dcb_write(dcb, buffer) && dcb_connect_SSL(dcb) >= 0)
        {