Merge pull request #6990

a264c32 http: speed up shutdown (Wladimir J. van der Laan)
This commit is contained in:
Gregory Maxwell
2015-11-13 11:29:33 -08:00
3 changed files with 22 additions and 12 deletions

View File

@@ -668,7 +668,7 @@ bool AppInitServers(boost::thread_group& threadGroup)
return false;
if (GetBoolArg("-rest", false) && !StartREST())
return false;
if (!StartHTTPServer(threadGroup))
if (!StartHTTPServer())
return false;
return true;
}