Merge branch '2.2' into develop

2018-06-07 14:39:16 +03:00
parent 2481de260f 0dd7448586
commit 880db1353a
4 changed files with 76 additions and 13 deletions
--- a/server/core/test/test_server.cc
+++ b/server/core/test/test_server.cc
@ -131,6 +131,8 @@ bool test_load_config(const char *input, SERVER *server)
                 "Server authenticators differ");
            TEST(server->port == atoi(config_get_param(param, "port")->value), "Server ports differ");
            TEST(create_new_server(obj) == 0, "Failed to create server from loaded config");
+            duplicate_context_finish(&dcontext);
+            config_context_free(obj);
        }
    }