Update CHANGELOG

spencerlievens · spencerlievens · commit 25924345b632 · 2018-01-06T20:50:49.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@
 * util: Add ParseUInt32 and ParseUInt64
 * [RPC] getmempoolancestors/getmempooldescendants
 * [RPC] setnetworkactive
+* httpserver: drop boost
 * Update CHANGELOG
 
 **Dynamic v2.2.0.0**
diff --git a/src/httpserver.cpp b/src/httpserver.cpp
@@ -498,7 +498,7 @@ 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 (threadResult.valid() && threadResult.wait_for(std::chrono::milliseconds(2000)) == std::future_status::timeout) {
+        if (threadResult.valid() && threadResult.wait_for(std::chrono::milliseconds(2000)) == std::future_status::timeout) {
             LogPrintf("HTTP event loop did not exit within allotted time, sending loopbreak\n");
             event_base_loopbreak(eventBase);
         }

Original file line number	Diff line number	Diff line change
`@@ -498,7 +498,7 @@ void StopHTTPServer()`
`498`	`498`	`// master that appears to be solved, so in the future that solution`
`499`	`499`	`// could be used again (if desirable).`
`500`	`500`	`// (see discussion in https://github.com/bitcoin/bitcoin/pull/6990)`
`501`		`-+ if (threadResult.valid() && threadResult.wait_for(std::chrono::milliseconds(2000)) == std::future_status::timeout) {`
	`501`	`+ if (threadResult.valid() && threadResult.wait_for(std::chrono::milliseconds(2000)) == std::future_status::timeout) {`
`502`	`502`	`LogPrintf("HTTP event loop did not exit within allotted time, sending loopbreak\n");`
`503`	`503`	`event_base_loopbreak(eventBase);`
`504`	`504`	`}`