|
|
|
@ -487,7 +487,11 @@ void StopHTTPServer()
@@ -487,7 +487,11 @@ void StopHTTPServer()
|
|
|
|
|
// master that appears to be solved, so in the future that solution
|
|
|
|
|
// could be used again (if desirable).
|
|
|
|
|
// (see discussion in https://github.com/bitcoin/bitcoin/pull/6990)
|
|
|
|
|
#if BOOST_VERSION >= 105000 |
|
|
|
|
if (!threadHTTP.try_join_for(boost::chrono::milliseconds(2000))) { |
|
|
|
|
#else |
|
|
|
|
if (!threadHTTP.timed_join(boost::posix_time::milliseconds(2000))) { |
|
|
|
|
#endif |
|
|
|
|
LogPrintf("HTTP event loop did not exit within allotted time, sending loopbreak\n"); |
|
|
|
|
event_base_loopbreak(eventBase); |
|
|
|
|
threadHTTP.join(); |
|
|
|
|