Merge branch 'maint-19' into maint

* maint-19:
  Updated OTP version
  Update release notes
  Update version numbers
  Fix statistics(wall_clock) and statistics(runtime) implementation
  fixup! erts: Cleanup dropped port tasks correctly
  erts: Add tests to detect port close race
  Add a testcase for OTP-13939/ERL-193
  erts: Cleanup dropped port tasks correctly
  Mark socket disconnected on tcp_send_or_shutdown_error

1 files changed, 6 insertions, 0 deletions

diff --git a/erts/emulator/drivers/common/inet_drv.c b/erts/emulator/drivers/common/inet_drv.c
index 13ee935e45..fe421bfe12 100644
--- a/erts/emulator/drivers/common/inet_drv.c
+++ b/erts/emulator/drivers/common/inet_drv.c
@@ -4334,6 +4334,12 @@ static void desc_close(inet_descriptor* desc)
 	desc->event = INVALID_EVENT; /* closed by stop_select callback */
 	desc->s = INVALID_SOCKET;
 	desc->event_mask = 0;
+
+	/* mark as disconnected in case when socket is left lingering due to
+	 * {exit_on_close, false} option in gen_tcp socket creation. Next
+	 * write to socket should produce {error, enotconn} and send a
+	 * message {tcp_error,#Port<>,econnreset} */
+	desc->state &= ~INET_STATE_CONNECTED;
     }
 }