hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.1' into develop

Browse Source
This commit is contained in:
Markus Mäkelä
2017-04-05 11:34:59 +03:00
parent 1fb8cde5d8 e0a98f6539
commit ad1c05b015
51 changed files with 1133 additions and 450 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/core/config_runtime.cc
View File

@ -472,7 +472,7 @@ bool runtime_create_listener(SERVICE *service, const char *name, const char *add
if (addr == NULL || strcasecmp(addr, "default") == 0)
{
addr = "0.0.0.0";
addr = "::";
}
if (port == NULL || strcasecmp(port, "default") == 0)
{
@ -519,7 +519,7 @@ bool runtime_create_listener(SERVICE *service, const char *name, const char *add
if (rval)
{
const char *print_addr = addr ? addr : "0.0.0.0";
const char *print_addr = addr ? addr : "::";
SERV_LISTENER *listener = serviceCreateListener(service, name, proto, addr,
u_port, auth, auth_opt, ssl);