Merge branch '2.1' into develop

2017-08-15 10:31:30 +03:00
parent 49ba1f8fa0 3485a32731
commit de7004cb95
12 changed files with 24 additions and 24 deletions
--- a/server/core/utils.cc
+++ b/server/core/utils.cc
@ -989,7 +989,7 @@ int open_network_socket(enum mxs_socket_type type, struct sockaddr_storage *addr
 {
    ss_dassert(type == MXS_SOCKET_NETWORK || type == MXS_SOCKET_LISTENER);
    struct addrinfo *ai = NULL, hint = {};
-    int so, rc;
+    int so = 0, rc = 0;
    hint.ai_socktype = SOCK_STREAM;
    hint.ai_family = AF_UNSPEC;
    hint.ai_flags = AI_ALL;