aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/src/inet.erl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2015-10-26 09:12:35 +0100
committerIngela Anderton Andin <[email protected]>2015-10-26 09:12:35 +0100
commitabb62a6d1918bc46ada942ae4f4c79caf2690d86 (patch)
tree902cf0d0840c896e8dc7df7ab26bf2e284fc39cc /lib/kernel/src/inet.erl
parenta76cc1d337c0bf44ecefebeccac2d08e496ba7e8 (diff)
parent235bf943d762bfdb5638d23b3270f92c50050b0a (diff)
downloadotp-abb62a6d1918bc46ada942ae4f4c79caf2690d86.tar.gz
otp-abb62a6d1918bc46ada942ae4f4c79caf2690d86.tar.bz2
otp-abb62a6d1918bc46ada942ae4f4c79caf2690d86.zip
Merge branch 'ia/pr/758/OTP-12837' into maint
* ia/pr/758/OTP-12837: erts: Include test in group so that it is run erts: Clarify documentation erts: Add {line_delimiter, byte()} option to inet:setopts/2
Diffstat (limited to 'lib/kernel/src/inet.erl')
-rw-r--r--lib/kernel/src/inet.erl4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/kernel/src/inet.erl b/lib/kernel/src/inet.erl
index da7f04089d..855c6377a3 100644
--- a/lib/kernel/src/inet.erl
+++ b/lib/kernel/src/inet.erl
@@ -671,7 +671,7 @@ stats() ->
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
connect_options() ->
[tos, priority, reuseaddr, keepalive, linger, sndbuf, recbuf, nodelay,
- header, active, packet, packet_size, buffer, mode, deliver,
+ header, active, packet, packet_size, buffer, mode, deliver, line_delimiter,
exit_on_close, high_watermark, low_watermark, high_msgq_watermark,
low_msgq_watermark, send_timeout, send_timeout_close, delay_send, raw,
show_econnreset].
@@ -721,6 +721,8 @@ con_opt([Opt | Opts], #connect_opts{} = R, As) ->
{active,N} when is_integer(N), N < 32768, N >= -32768 ->
NOpts = lists:keydelete(active, 1, R#connect_opts.opts),
con_opt(Opts, R#connect_opts { opts = [{active,N}|NOpts] }, As);
+ {line_delimiter,C} when is_integer(C), C >= 0, C =< 255 ->
+ con_add(line_delimiter, C, R, Opts, As);
{Name,Val} when is_atom(Name) -> con_add(Name, Val, R, Opts, As);
_ -> {error, badarg}
end;