diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2012-03-19 16:25:39 +0100 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2012-03-19 16:25:39 +0100 |
| commit | 68ba8d70deb1549dd37a8325eea686c9908f926b (patch) | |
| tree | 50fbabbf3cb2a52b10fc9a629195baf22b8d17ca /erts/emulator/beam | |
| parent | 662e3ffeed74d9121315d86af46430dd71e01709 (diff) | |
| parent | 65ba37d1371f36a1666a53c57ac42c73692b8096 (diff) | |
| download | otp-68ba8d70deb1549dd37a8325eea686c9908f926b.tar.gz otp-68ba8d70deb1549dd37a8325eea686c9908f926b.tar.bz2 otp-68ba8d70deb1549dd37a8325eea686c9908f926b.zip | |
Merge branch 'ph/fix-enfile/OTP-9990' into maint
* ph/fix-enfile/OTP-9990:
Update preloaded prim_inet.beam
gen_tcp: Use correct specs for accept and listen
prim_inet: Catch system_limit in open_port
Fix returned error from gen_tcp:accept/1,2 when running out of ports
Diffstat (limited to 'erts/emulator/beam')
| -rw-r--r-- | erts/emulator/beam/io.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/io.c b/erts/emulator/beam/io.c index b23b1f628d..fe1a7ba345 100644 --- a/erts/emulator/beam/io.c +++ b/erts/emulator/beam/io.c @@ -743,7 +743,7 @@ driver_create_port(ErlDrvPort creator_port_ix, /* Creating port */ return (ErlDrvTermData) -1; /* pid does not exist */ } if ((port_num = get_free_port()) < 0) { - errno = ENFILE; + errno = SYSTEM_LIMIT; erts_smp_proc_unlock(rp, ERTS_PROC_LOCK_LINK); erts_smp_mtx_unlock(&erts_driver_list_lock); return (ErlDrvTermData) -1; |