3 files changed, 4 insertions, 33 deletions
diff --git a/lib/inets/src/ftp/ftp.erl b/lib/inets/src/ftp/ftp.erl
index 132a384a49..5d9887a9a4 100644
--- a/lib/inets/src/ftp/ftp.erl
+++ b/lib/inets/src/ftp/ftp.erl
@@ -1417,7 +1417,7 @@ handle_info({'DOWN', _Ref, _Type, Process, Reason}, State) ->
 
 handle_info({'EXIT', Pid, Reason}, #state{progress = Pid} = State) ->
     Report = io_lib:format("Progress reporting stopped for reason ~p~n",
-			   Reason),
+			   [Reason]),
     error_logger:info_report(Report),
     {noreply, State#state{progress = ignore}};
    
diff --git a/lib/inets/src/http_client/httpc.erl b/lib/inets/src/http_client/httpc.erl
index 41bba7995e..4d7023a8e9 100644
--- a/lib/inets/src/http_client/httpc.erl
+++ b/lib/inets/src/http_client/httpc.erl
@@ -175,7 +175,7 @@ request(Method,
 request(Method, 
 	{Url, Headers, ContentType, Body}, 
 	HTTPOptions, Options, Profile) 
-  when ((Method =:= post) orelse (Method =:= put)) andalso 
+  when ((Method =:= post) orelse (Method =:= put) orelse (Method =:= delete)) andalso 
        (is_atom(Profile) orelse is_pid(Profile)) ->
     ?hcrt("request", [{method,       Method}, 
 		      {url,          Url},
diff --git a/lib/inets/src/http_server/httpd_manager.erl b/lib/inets/src/http_server/httpd_manager.erl
index c83d06a158..00384fa108 100644
--- a/lib/inets/src/http_server/httpd_manager.erl
+++ b/lib/inets/src/http_server/httpd_manager.erl
@@ -507,37 +507,8 @@ code_change(_FromVsn, State, _Extra) ->
 
 check_connections(#state{connections = []} = State, _Pid, _Reason) ->
     State;
-check_connections(#state{admin_state = shutting_down,
-			 connections = Connections} = State, Pid, Reason) ->
-    %% Could be a crashing request handler
-    case lists:delete(Pid, Connections) of
-	[] -> % Crashing request handler => block complete
-	    String = 
-		lists:flatten(
-		  io_lib:format("request handler (~p) crashed:"
-				"~n   ~p", [Pid, Reason])),
-	    report_error(State, String),
-	    demonitor_blocker(State#state.blocker_ref),
-	    {Tmr,From,Ref} = State#state.blocking_tmr,
-	    stop_block_tmr(Tmr),
-	    From ! {block_reply,ok,Ref},
-	    State#state{admin_state = blocked, connections = [],
-			blocker_ref = undefined};
-	Connections1 ->
-	    State#state{connections = Connections1}
-    end;
-check_connections(#state{connections = Connections} = State, Pid, Reason) ->
-    case lists:delete(Pid, Connections) of
-	Connections -> % Not a request handler, so ignore
-	    State;
-        NewConnections ->
-	    String = 
-		lists:flatten(
-		  io_lib:format("request handler (~p) crashed:"
-				"~n   ~p", [Pid, Reason])),
-	    report_error(State, String),
-	    State#state{connections = NewConnections}
-    end.
+check_connections(#state{connections = Connections} = State, Pid, _Reason) ->
+	    State#state{connections = lists:delete(Pid, Connections)}.
 
 
 %% -------------------------------------------------------------------------