Clarify that THREAD_PER_CONNECTION and max_thread_stack_size are incompatible

etr · etr · commit a9b8351a11c1 · 2019-01-03T03:40:28.000Z
diff --git a/src/webserver.cpp b/src/webserver.cpp
@@ -270,7 +270,7 @@ 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::THREAD_PER_CONNECTION && max_threads != 0)
+    if(start_method == http_utils::THREAD_PER_CONNECTION && (max_threads != 0 || max_thread_stack_size != 0))
     {
         throw std::invalid_argument("Cannot specify maximum number of threads when using a thread per connection");
     }
diff --git a/test/integ/ws_start_stop.cpp b/test/integ/ws_start_stop.cpp
@@ -301,6 +301,15 @@ LT_BEGIN_AUTO_TEST(ws_start_stop_suite, thread_per_connection_fails_with_max_thr
     }
 LT_END_AUTO_TEST(thread_per_connection_fails_with_max_threads)
 
+LT_BEGIN_AUTO_TEST(ws_start_stop_suite, thread_per_connection_fails_with_max_threads_stack_size)
+    {
+    webserver ws = create_webserver(8080)
+        .start_method(http::http_utils::THREAD_PER_CONNECTION)
+        .max_thread_stack_size(4*1024*1024);
+    LT_CHECK_THROW(ws.start(false));
+    }
+LT_END_AUTO_TEST(thread_per_connection_fails_with_max_threads_stack_size)
+
 LT_BEGIN_AUTO_TEST(ws_start_stop_suite, tuning_options)
     webserver ws = create_webserver(8080)
         .max_connections(10)

Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,7 @@ bool webserver::start(bool blocking)`
`270`	`270`	`// iov.push_back(gen(MHD_OPTION_SOCK_ADDR, (intptr_t) bind_address));`
`271`	`271`	`if(bind_socket != 0)`
`272`	`272`	`iov.push_back(gen(MHD_OPTION_LISTEN_SOCKET, bind_socket));`
`273`		`- if(start_method == http_utils::THREAD_PER_CONNECTION && max_threads != 0)`
	`273`	`+ if(start_method == http_utils::THREAD_PER_CONNECTION && (max_threads != 0 \|\| max_thread_stack_size != 0))`
`274`	`274`	`{`
`275`	`275`	`throw std::invalid_argument("Cannot specify maximum number of threads when using a thread per connection");`
`276`	`276`	`}`