Merge branch '2.3' into 2.4

This commit is contained in:
Markus Mäkelä
2020-12-01 10:11:56 +02:00

View File

@ -434,8 +434,10 @@ bool mxs_admin_init()
return false; return false;
} }
// The port argument is ignored and the port in the struct sockaddr is used instead // The port argument is only used for error reporting. The actual address and port that the daemon
http_daemon = MHD_start_daemon(options, 0, NULL, NULL, handle_client, NULL, // binds to is in the `struct sockaddr`.
http_daemon = MHD_start_daemon(options, config_get_global_options()->admin_port,
NULL, NULL, handle_client, NULL,
MHD_OPTION_EXTERNAL_LOGGER, admin_log_error, NULL, MHD_OPTION_EXTERNAL_LOGGER, admin_log_error, NULL,
MHD_OPTION_NOTIFY_COMPLETED, close_client, NULL, MHD_OPTION_NOTIFY_COMPLETED, close_client, NULL,
MHD_OPTION_SOCK_ADDR, &addr, MHD_OPTION_SOCK_ADDR, &addr,