diff options
| author | Lukas Larsson <[email protected]> | 2013-10-07 17:24:11 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2013-10-07 17:24:11 +0200 |
| commit | 5ee95f1f10f879a9caec67248c27e74dacbf276d (patch) | |
| tree | 42dc7c80174154357373c1ba9e614d15dc2c8bf7 /lib/kernel/src/gen_tcp.erl | |
| parent | 036727ce61cfbd51ece3d20a07d33c10c035ecec (diff) | |
| parent | 1e6c600111fac2cf564bcdfab0230ffd70cb30c3 (diff) | |
| download | otp-5ee95f1f10f879a9caec67248c27e74dacbf276d.tar.gz otp-5ee95f1f10f879a9caec67248c27e74dacbf276d.tar.bz2 otp-5ee95f1f10f879a9caec67248c27e74dacbf276d.zip | |
Merge branch 'sv-socket-active-n'
OTP-11368
* sv-socket-active-n:
Update preloaded
add {active,N} socket option for TCP, UDP, and SCTP
Diffstat (limited to 'lib/kernel/src/gen_tcp.erl')
| -rw-r--r-- | lib/kernel/src/gen_tcp.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/kernel/src/gen_tcp.erl b/lib/kernel/src/gen_tcp.erl index 96026aa428..bc8ffbe5e3 100644 --- a/lib/kernel/src/gen_tcp.erl +++ b/lib/kernel/src/gen_tcp.erl @@ -30,7 +30,7 @@ -include("file.hrl"). -type option() :: - {active, true | false | once} | + {active, true | false | once | -32768..32767} | {buffer, non_neg_integer()} | {delay_send, boolean()} | {deliver, port | term} | |