Merge subtree Beast 1.0.0-b3

Merge commit '47eb7fcc2f30df883b0036d97aac6a0fa90b0e9f'
This commit is contained in:
Vinnie Falco
2016-05-06 14:52:15 -04:00
157 changed files with 7040 additions and 4117 deletions

View File

@@ -17,9 +17,9 @@
*/
//==============================================================================
#include "http_async_server.h"
#include "http_sync_server.h"
#include "sig_wait.h"
#include "http_async_server.hpp"
#include "http_sync_server.hpp"
#include "../test/sig_wait.hpp"
#include <boost/program_options.hpp>
@@ -69,13 +69,8 @@ int main(int ac, char const* av[])
endpoint_type ep{address_type::from_string(ip), port};
if(sync)
{
http_sync_server server(ep, root);
sig_wait();
}
else
{
http_async_server server(ep, threads, root);
sig_wait();
}
sig_wait();
}