Fixed start methods

Sebastiano Merlino · Sebastiano Merlino · commit 38ccaa718977 · 2015-12-28T15:56:17.000+01:00
diff --git a/src/httpserver/http_utils.hpp b/src/httpserver/http_utils.hpp
@@ -76,12 +76,12 @@ class http_utils
 
     enum start_method_T
     {
-        INTERNAL_SELECT = MHD_NO_FLAG,
 #if defined(__MINGW32__) || defined(__CYGWIN32__)
-        THREAD = MHD_USE_THREAD_PER_CONNECTION | MHD_USE_POLL
+        INTERNAL_SELECT = MHD_NO_FLAG,
 #else
-        THREAD = MHD_USE_THREAD_PER_CONNECTION | MHD_USE_EPOLL_LINUX_ONLY
+        INTERNAL_SELECT = MHD_NO_FLAG | MHD_USE_EPOLL_LINUX_ONLY | MHD_USE_EPOLL_TURBO,
 #endif
+        THREAD_PER_CONNECTION = MHD_USE_THREAD_PER_CONNECTION | MHD_USE_POLL
     };
 
     enum policy_T
diff --git a/src/webserver.cpp b/src/webserver.cpp
@@ -383,11 +383,12 @@ bool webserver::start(bool blocking)
         iov.push_back(gen(MHD_OPTION_SOCK_ADDR, (intptr_t) bind_address));
     if(bind_socket != 0)
         iov.push_back(gen(MHD_OPTION_LISTEN_SOCKET, bind_socket));
-    if(! (start_method == http_utils::INTERNAL_SELECT))
+    if(start_method == http_utils::THREAD_PER_CONNECTION && max_threads != 0)
     {
-        if(max_threads != 0)
-            iov.push_back(gen(MHD_OPTION_THREAD_POOL_SIZE, max_threads));
+        cout << "Cannot specify maximum number of threads when using a thread per connection" << endl;
+        throw ::httpserver::webserver_exception();
     }
+
     if(max_connections != 0)
         iov.push_back(gen(MHD_OPTION_CONNECTION_LIMIT, max_connections));
     if(memory_limit != 0)
