diff options
| author | Erlang/OTP <[email protected]> | 2016-05-03 10:10:53 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2016-05-03 10:10:53 +0200 |
| commit | 8c01f80cb349b202ad71e12c40efafa7f83f617a (patch) | |
| tree | 0ecd860f51d665900821794118fdee5892d27ef2 /lib/common_test/doc/src | |
| parent | 5cb58c72225de9e7c15d5adcaccff99f093d6543 (diff) | |
| parent | bdbb8bfdfb653f4394c7440e0c7d081599c86ddc (diff) | |
| download | otp-8c01f80cb349b202ad71e12c40efafa7f83f617a.tar.gz otp-8c01f80cb349b202ad71e12c40efafa7f83f617a.tar.bz2 otp-8c01f80cb349b202ad71e12c40efafa7f83f617a.zip | |
Merge branch 'peppe/ct_remove_nodelay/OTP-13462' into maint-18
* peppe/ct_remove_nodelay/OTP-13462:
Update the reference manual
Make the nodelay setting configurable and false per default
Diffstat (limited to 'lib/common_test/doc/src')
| -rw-r--r-- | lib/common_test/doc/src/ct_telnet.xml | 5 | ||||
| -rw-r--r-- | lib/common_test/doc/src/unix_telnet.xml | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/common_test/doc/src/ct_telnet.xml b/lib/common_test/doc/src/ct_telnet.xml index b7ba352104..1de278d30c 100644 --- a/lib/common_test/doc/src/ct_telnet.xml +++ b/lib/common_test/doc/src/ct_telnet.xml @@ -64,6 +64,8 @@ remaining string terminated) = 0</p></item> <item><p>Polling interval (sleep time between polls) = 1 second</p> </item> + <item><p>The TCP_NODELAY option for the telnet socket + is disabled (set to <c>false</c>) per default</p></item> </list> <p>These parameters can be modified by the user with the following @@ -76,7 +78,8 @@ {reconnection_interval,Millisec}, {keep_alive,Bool}, {poll_limit,N}, - {poll_interval,Millisec}]}.</pre> + {poll_interval,Millisec}, + {tcp_nodelay,Bool}]}.</pre> <p><c>Millisec = integer(), N = integer()</c></p> diff --git a/lib/common_test/doc/src/unix_telnet.xml b/lib/common_test/doc/src/unix_telnet.xml index 189379c39a..a064a222d6 100644 --- a/lib/common_test/doc/src/unix_telnet.xml +++ b/lib/common_test/doc/src/unix_telnet.xml @@ -80,7 +80,7 @@ <funcs> <func> - <name>connect(ConnName, Ip, Port, Timeout, KeepAlive, Extra) -> {ok, Handle} | {error, Reason}</name> + <name>connect(ConnName, Ip, Port, Timeout, KeepAlive, TCPNoDelay, Extra) -> {ok, Handle} | {error, Reason}</name> <fsummary>Callback for ct_telnet.erl.</fsummary> <type> <v>ConnName = target_name()</v> @@ -88,6 +88,7 @@ <v>Port = integer()</v> <v>Timeout = integer()</v> <v>KeepAlive = bool()</v> + <v>TCPNoDelay = bool()</v> <v>Extra = target_name() | {Username, Password}</v> <v>Username = string()</v> <v>Password = string()</v> |