aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2018-06-19 16:56:27 +0200
committerHans Nilsson <[email protected]>2018-06-19 16:56:27 +0200
commit94e9f7e95e3898bbe8695422fc9df6cb5a1264e3 (patch)
tree64a52367c5c6810b064521784b24e657b0f20de2 /lib
parent55fcfd11890423cf77a2486223dede13cfdb9807 (diff)
downloadotp-94e9f7e95e3898bbe8695422fc9df6cb5a1264e3.tar.gz
otp-94e9f7e95e3898bbe8695422fc9df6cb5a1264e3.tar.bz2
otp-94e9f7e95e3898bbe8695422fc9df6cb5a1264e3.zip
ftp: Disallow 'packet_size' for low-level options
Diffstat (limited to 'lib')
-rw-r--r--lib/inets/doc/src/ftp.xml2
-rw-r--r--lib/inets/src/ftp/ftp.erl1
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/inets/doc/src/ftp.xml b/lib/inets/doc/src/ftp.xml
index 126f415e81..feea7b978a 100644
--- a/lib/inets/doc/src/ftp.xml
+++ b/lib/inets/doc/src/ftp.xml
@@ -553,7 +553,7 @@
<v>port() = integer() > 0 (default is 21)</v>
<v>mode() = active | passive (default is passive)</v>
<v>tls_options() = [<seealso marker="ssl:ssl#type-ssloption">ssl:ssloption()</seealso>]</v>
- <v>sock_opts() = [<seealso marker="kernel:gen_tcp#type-option">gen_tcp:option()</seealso> except for ipv6_v6only, active, packet, mode and header</v>
+ <v>sock_opts() = [<seealso marker="kernel:gen_tcp#type-option">gen_tcp:option()</seealso> except for ipv6_v6only, active, packet, mode, packet_size and header</v>
<v>timeout() = integer() > 0 (default is 60000 milliseconds)</v>
<v>dtimeout() = integer() > 0 | infinity (default is infinity)</v>
<v>pogress() = ignore | {module(), function(), initial_data()} (default is ignore)</v>
diff --git a/lib/inets/src/ftp/ftp.erl b/lib/inets/src/ftp/ftp.erl
index 7509339eec..ffcccdefea 100644
--- a/lib/inets/src/ftp/ftp.erl
+++ b/lib/inets/src/ftp/ftp.erl
@@ -1073,6 +1073,7 @@ valid_socket_option({mode,_} ) -> false;
valid_socket_option(binary ) -> false;
valid_socket_option(list ) -> false;
valid_socket_option({header,_} ) -> false;
+valid_socket_option({packet_size,_} ) -> false;
valid_socket_option(_) -> true.