Merge commit '2f9a8440c2432d8a196571d6300404cb76314125' into develop

This commit is contained in:
Vinnie Falco
2016-09-15 14:21:55 -04:00
134 changed files with 2838 additions and 2670 deletions

View File

@@ -57,8 +57,13 @@ int main(int ac, char const* av[])
endpoint_type ep{address_type::from_string(ip), port};
if(sync)
{
http_sync_server server(ep, root);
beast::test::sig_wait();
}
else
{
http_async_server server(ep, threads, root);
beast::test::sig_wait();
beast::test::sig_wait();
}
}