From 793667af1c31835e0eefcdd283930bb89cfeda8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Barbosa?= <joao.paulo.barbosa@gmail.com>
Date: Tue, 8 Aug 2017 13:30:04 +0100
Subject: [PATCH] Improve shutdown process

---
 src/httpserver.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/httpserver.cpp b/src/httpserver.cpp
index ba012554006a4..adb64a65d75d5 100644
--- a/src/httpserver.cpp
+++ b/src/httpserver.cpp
@@ -481,6 +481,8 @@ void StopHTTPServer()
     }
     if (eventBase) {
         LogPrint(BCLog::HTTP, "Waiting for HTTP event thread to exit\n");
+        // Exit the event loop as soon as there are no active events.
+        event_base_loopexit(eventBase, nullptr);
         // Give event loop a few seconds to exit (to send back last RPC responses), then break it
         // Before this was solved with event_base_loopexit, but that didn't work as expected in
         // at least libevent 2.0.21 and always introduced a delay. In libevent