From 425b826e7fefe3bd4b174adfb8ead5953dd5dadf Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Tue, 10 Oct 2017 18:19:23 +0200
Subject: inets: Make sure httpd:stop_service is synchronous

---
 lib/inets/src/http_server/httpd.erl | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'lib/inets/src')

diff --git a/lib/inets/src/http_server/httpd.erl b/lib/inets/src/http_server/httpd.erl
index 0b632d24e3..540e68e749 100644
--- a/lib/inets/src/http_server/httpd.erl
+++ b/lib/inets/src/http_server/httpd.erl
@@ -99,7 +99,14 @@ start_service(Conf) ->
 stop_service({Address, Port}) ->
     stop_service({Address, Port, ?DEFAULT_PROFILE});
 stop_service({Address, Port, Profile}) ->
-     httpd_sup:stop_child(Address, Port, Profile);
+    Name  = httpd_util:make_name("httpd_instance_sup", Address, Port, Profile),
+    Pid = whereis(Name),
+    MonitorRef = erlang:monitor(process, Pid),
+    Result = httpd_sup:stop_child(Address, Port, Profile),
+    receive
+        {'DOWN', MonitorRef, _, _, _} ->
+            Result
+    end;     
 stop_service(Pid) when is_pid(Pid) ->
     case service_info(Pid)  of
 	{ok, Info} ->	   
-- 
cgit v1.2.3