diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-10-26 10:33:14 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-10-26 10:33:14 +0100 |
| commit | 030447db58eba15398a357a81f20efa409113bc9 (patch) | |
| tree | 160eceb4aace2bd51a49ff66dcbb197cd0ce931c /lib/kernel/src | |
| parent | d9f88cbd3c096d09cac05450e6b075b1109da1a0 (diff) | |
| parent | abb62a6d1918bc46ada942ae4f4c79caf2690d86 (diff) | |
| download | otp-030447db58eba15398a357a81f20efa409113bc9.tar.gz otp-030447db58eba15398a357a81f20efa409113bc9.tar.bz2 otp-030447db58eba15398a357a81f20efa409113bc9.zip | |
Update primary bootstrap
Diffstat (limited to 'lib/kernel/src')
| -rw-r--r-- | lib/kernel/src/inet.erl | 4 | ||||
| -rw-r--r-- | lib/kernel/src/inet_int.hrl | 1 |
2 files changed, 4 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; diff --git a/lib/kernel/src/inet_int.hrl b/lib/kernel/src/inet_int.hrl index bfe4c9ec8c..e7c6cf8ae2 100644 --- a/lib/kernel/src/inet_int.hrl +++ b/lib/kernel/src/inet_int.hrl @@ -149,6 +149,7 @@ -define(INET_LOPT_MSGQ_LOWTRMRK, 37). -define(INET_LOPT_NETNS, 38). -define(INET_LOPT_TCP_SHOW_ECONNRESET, 39). +-define(INET_LOPT_LINE_DELIM, 40). % Specific SCTP options: separate range: -define(SCTP_OPT_RTOINFO, 100). -define(SCTP_OPT_ASSOCINFO, 101). |