Merge branch 'maint-r15' into maint-r16

Conflicts:
	lib/inets/doc/src/notes.xml
	lib/inets/src/inets_app/inets.appup.src
	lib/inets/vsn.mk
	lib/ssh/doc/src/notes.xml
	lib/ssh/src/ssh.appup.src
	lib/ssh/src/ssh_connection_handler.erl
	lib/ssh/vsn.mk

2 files changed, 15 insertions, 33 deletions

diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index 72d67ddb4a..d2e7ade5d6 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -32,7 +32,6 @@
     <file>notes.xml</file>
   </header>
   
-  
   <section><title>Inets 5.9.5</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
@@ -93,7 +92,6 @@
 </section>
 
 <section><title>Inets 5.9.4</title>
-
     <section><title>Improvements and New Features</title>
       <list>
         <item>
@@ -161,6 +159,19 @@
 
 </section>
 
+<section><title>Inets 5.9.2.1</title>
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Fixed obsolete error report in inets.</p>
+	  <p>
+	    Own Id: OTP-11185 Aux Id: seq12357 </p>
+	</item>
+      </list>
+    </section>
+</section>
+
 <section><title>Inets 5.9.2</title>
 
     <section><title>Improvements and New Features</title>
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)}.
 
 
 %% -------------------------------------------------------------------------