Merge pull request #577 from lukase/master

Windows HTTP timeout workaround
OpenLightingProject · Dec 16, 2014 · b3836a9 · b3836a9
2 parents 3f007bf + 7ecf725
commit b3836a9
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/common/http/HTTPServer.cpp b/common/http/HTTPServer.cpp
@@ -488,8 +488,14 @@ void *HTTPServer::Run() {
 
   OLA_INFO << "HTTP Server started on port " << m_port;
 
+#ifdef _WIN32
+  // set a short poll interval since we'd block too long otherwise.
+  // TODO(Lukas) investigate why the poller does not wake up on HTTP requests.
+  m_select_server.SetDefaultInterval(TimeInterval(1, 0));
+#else
   // set a long poll interval so we don't spin
   m_select_server.SetDefaultInterval(TimeInterval(60, 0));
+#endif
   m_select_server.Run();
 
   // clean up any remaining sockets