Fix c2s connection close on demand

Fixes #1652

src/mod_ping.erl

@@ -146,7 +146,7 @@ handle_cast({iq_pong, JID, timeout}, State) ->
 	      JID,
 	  case ejabberd_sm:get_session_pid(User, Server, Resource)
 	      of
-	    Pid when is_pid(Pid) -> ejabberd_c2s:close(Pid);
+	    Pid when is_pid(Pid) -> ejabberd_c2s:close(Pid, _SendTrailer = false);
 	    _ -> ok
 	  end;
       _ -> ok

src/xmpp_stream_in.erl

@@ -271,6 +271,16 @@ handle_cast({send, Pkt}, State) ->
     noreply(send_pkt(State, Pkt));
 handle_cast(stop, State) ->
     {stop, normal, State};
+handle_cast({close, SendTrailer}, #{mod := Mod} = State) ->
+    noreply(
+      case is_disconnected(State) of
+	  true -> State;
+	  false ->
+	      State1 = close(State, SendTrailer),
+	      try Mod:handle_stream_end({socket, closed}, State1)
+	      catch _:undef -> stop(State1)
+	      end
+      end);
 handle_cast(Cast, #{mod := Mod} = State) ->
     noreply(try Mod:handle_cast(Cast, State)
 	      catch _:undef -> State

src/xmpp_stream_out.erl

@@ -302,6 +302,16 @@ handle_cast({send, Pkt}, State) ->
     noreply(send_pkt(State, Pkt));
 handle_cast(stop, State) ->
     {stop, normal, State};
+handle_cast({close, SendTrailer}, #{mod := Mod} = State) ->
+    noreply(
+      case is_disconnected(State) of
+	  true -> State;
+	  false ->
+	      State1 = close(State, SendTrailer),
+	      try Mod:handle_stream_end({socket, closed}, State1)
+	      catch _:undef -> stop(State1)
+	      end
+      end);
 handle_cast(Cast, #{mod := Mod} = State) ->
     noreply(try Mod:handle_cast(Cast, State)
 	    catch _:undef -> State