diff options
| author | Hans Nilsson <[email protected]> | 2017-11-20 12:10:18 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2017-11-20 12:10:18 +0100 |
| commit | fbc24513ab2d241d912225d067b72e517742e698 (patch) | |
| tree | 9681f34f10af325198018e2db74ab6a77ce977cb /erts | |
| parent | 8aeb2efdb04aefd03a22ee7a9bdb9cc0af333db4 (diff) | |
| parent | bab7b1aba04209c90d15be7147cc3524ae6964f5 (diff) | |
| download | otp-fbc24513ab2d241d912225d067b72e517742e698.tar.gz otp-fbc24513ab2d241d912225d067b72e517742e698.tar.bz2 otp-fbc24513ab2d241d912225d067b72e517742e698.zip | |
Merge branch 'maint'
* maint:
Updated OTP version
Prepare release
ssh: testcases for space trailing Hello msg
ssh: Don't remove trailing WS in Hello msg
ssh: dialyzer fixes
ssh: Fix broken error handling during session setup
Remove invalid EINTR loop around close(2)
Conflicts:
OTP_VERSION
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/doc/src/notes.xml | 26 | ||||
| -rw-r--r-- | erts/emulator/drivers/unix/unix_efile.c | 2 | ||||
| -rw-r--r-- | erts/vsn.mk | 2 |
3 files changed, 28 insertions, 2 deletions
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml index fca892dda1..74cc9d1cc1 100644 --- a/erts/doc/src/notes.xml +++ b/erts/doc/src/notes.xml @@ -31,6 +31,32 @@ </header> <p>This document describes the changes made to the ERTS application.</p> +<section><title>Erts 9.1.5</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p>Fixed a bug in file closure on Unix; close(2) was + retried on EINTR which could cause a different (recently + opened) file to be closed as well.</p> + <p> + Own Id: OTP-14775</p> + </item> + <item> + <p> + A race-condition when tearing down a connection with + active node monitors could cause the runtime system to + crash.</p> + <p> + This bug was introduced in ERTS version 8.0 (OTP 19.0).</p> + <p> + Own Id: OTP-14781 Aux Id: OTP-13047 </p> + </item> + </list> + </section> + +</section> + <section><title>Erts 9.1.4</title> <section><title>Fixed Bugs and Malfunctions</title> diff --git a/erts/emulator/drivers/unix/unix_efile.c b/erts/emulator/drivers/unix/unix_efile.c index f8341f788a..33e4d75ef7 100644 --- a/erts/emulator/drivers/unix/unix_efile.c +++ b/erts/emulator/drivers/unix/unix_efile.c @@ -466,7 +466,7 @@ efile_may_openfile(Efile_error* errInfo, char *name) { void efile_closefile(int fd) { - while((close(fd) < 0) && (errno == EINTR)); + close(fd); } int diff --git a/erts/vsn.mk b/erts/vsn.mk index 220c3b5f6c..8cb891e384 100644 --- a/erts/vsn.mk +++ b/erts/vsn.mk @@ -18,7 +18,7 @@ # %CopyrightEnd% # -VSN = 9.1.4 +VSN = 9.1.5 # Port number 4365 in 4.2 # Port number 4366 in 4.3 |