diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2012-03-19 16:35:04 +0100 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2012-03-19 16:35:04 +0100 |
| commit | 252b055e7f05e2beb91d680635dec9a9b307b1b1 (patch) | |
| tree | f9055b368bcc947ca331725d17ed153173317e11 /lib/kernel/src/gen_tcp.erl | |
| parent | 6dc3f61a6e2a635de31c2016e7bd8e6ff16533af (diff) | |
| parent | 68ba8d70deb1549dd37a8325eea686c9908f926b (diff) | |
| download | otp-252b055e7f05e2beb91d680635dec9a9b307b1b1.tar.gz otp-252b055e7f05e2beb91d680635dec9a9b307b1b1.tar.bz2 otp-252b055e7f05e2beb91d680635dec9a9b307b1b1.zip | |
Merge branch 'maint'
Conflicts:
erts/preloaded/ebin/prim_inet.beam
Diffstat (limited to 'lib/kernel/src/gen_tcp.erl')
| -rw-r--r-- | lib/kernel/src/gen_tcp.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/kernel/src/gen_tcp.erl b/lib/kernel/src/gen_tcp.erl index 4d6c7f5f1d..56d0451e44 100644 --- a/lib/kernel/src/gen_tcp.erl +++ b/lib/kernel/src/gen_tcp.erl @@ -175,7 +175,7 @@ try_connect([], _Port, _Opts, _Timer, _Mod, Err) -> Port :: inet:port_number(), Options :: [listen_option()], ListenSocket :: socket(), - Reason :: inet:posix(). + Reason :: system_limit | inet:posix(). listen(Port, Opts) -> Mod = mod(Opts, undefined), @@ -194,7 +194,7 @@ listen(Port, Opts) -> -spec accept(ListenSocket) -> {ok, Socket} | {error, Reason} when ListenSocket :: socket(), Socket :: socket(), - Reason :: closed | timeout | inet:posix(). + Reason :: closed | timeout | system_limit | inet:posix(). accept(S) -> case inet_db:lookup_socket(S) of @@ -208,7 +208,7 @@ accept(S) -> ListenSocket :: socket(), Timeout :: timeout(), Socket :: socket(), - Reason :: closed | timeout | inet:posix(). + Reason :: closed | timeout | system_limit | inet:posix(). accept(S, Time) when is_port(S) -> case inet_db:lookup_socket(S) of |