diff --git a/documentation/configuration.md b/documentation/configuration.md index 2051b30b7..f1dd01902 100644 --- a/documentation/configuration.md +++ b/documentation/configuration.md @@ -248,7 +248,7 @@ corresponding connection. When the value is negaive, the default system user timeout will be used. -When no value or 0 is provided `floor(keepalive + keepalive_keep_interval * keepalive_probes - 0.5)` is used. +When no value or 0 is provided `1000 * (keepalive + keepalive_keep_interval * keepalive_probes) - 500` is used. `keepalive_usr_timeout 7` diff --git a/stress/CMakeLists.txt b/stress/CMakeLists.txt index a76e4be41..b63f92a64 100644 --- a/stress/CMakeLists.txt +++ b/stress/CMakeLists.txt @@ -13,7 +13,7 @@ if(THREADS_HAVE_PTHREAD_ARG) set_property(TARGET ${od_stress_binary} PROPERTY INTERFACE_COMPILE_OPTIONS "-pthread") endif() -target_link_libraries(${od_stress_binary} ${od_libraries} ${CMAKE_THREAD_LIBS_INIT} m) +target_link_libraries(${od_stress_binary} ${od_libraries} ${CMAKE_THREAD_LIBS_INIT}) if (BUILD_COMPRESSION) target_link_libraries(${od_stress_binary} ${compression_libraries})