Revert "lib/curl/Global: remove lower bound on timeouts"

This reverts commit 4475b8ca. Further testing revealed that the threaded resolver still uses a timeout of 0ms. This revert however lowers the bound to a minimum of 1ms instead of 10ms.

Revert "lib/curl/Global: remove lower bound on timeouts"
6d54928d · Max Kellermann · 0dffe05b · 6d54928d
Commit 6d54928d authored Dec 24, 2019 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

Global.cxx src/lib/curl/Global.cxx +7 -0

No files found.
--- a/src/lib/curl/Global.cxx
+++ b/src/lib/curl/Global.cxx
@@ -225,6 +225,13 @@ CurlGlobal::UpdateTimeout(long timeout_ms) noexcept
 		return;
 	}

+	if (timeout_ms < 1)
+		/* CURL's threaded resolver sets a timeout of 0ms, which
+		   means we're running in a busy loop.  Quite a bad
+		   idea to waste so much CPU.  Let's use a lower limit
+		   of 1ms. */
+		timeout_ms = 1;
+
 	timeout_event.Schedule(std::chrono::milliseconds(timeout_ms));
 }