aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/src/ftp/ftp_response.erl
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2013-11-20 12:04:16 +0100
committerHans Nilsson <[email protected]>2013-11-20 12:04:16 +0100
commit265f95e7fc9f813c7d0c7d1fb64e5084515089c9 (patch)
tree9525eed9a4989228c588451661fa9de3f5db187e /lib/inets/src/ftp/ftp_response.erl
parent4bb55a35e516cb407bdda1b319ab2cd0bb85a3b8 (diff)
parent0d57daec5738447eb033681834146bf31dfd266c (diff)
downloadotp-265f95e7fc9f813c7d0c7d1fb64e5084515089c9.tar.gz
otp-265f95e7fc9f813c7d0c7d1fb64e5084515089c9.tar.bz2
otp-265f95e7fc9f813c7d0c7d1fb64e5084515089c9.zip
Merge branch 'hans/inets/ftps/OTP-11037' into maint
* hans/inets/ftps/OTP-11037: ftp,ssl: Fixes broken type link (ssloption). ftp: Adds dynamic cert generation to tests. ftp: Clean Makefile and conf file ftp: Linking rfc-refs. ftp: Add documentation. ftp: delete old test files ftp: small fixes ftp: Add ftps documentation ftp: Add timeouts to ssl:connect ftps: working . added some printouts ftp: towards a working ftps, chapter 1 ftp: old ftp_SUITE re-written and works ftp: Implement ftps (upgrade to TLS) ftp: Implement ftps (upgrade to TLS)
Diffstat (limited to 'lib/inets/src/ftp/ftp_response.erl')
-rw-r--r--lib/inets/src/ftp/ftp_response.erl2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/inets/src/ftp/ftp_response.erl b/lib/inets/src/ftp/ftp_response.erl
index 4bf788e946..dfe180ff18 100644
--- a/lib/inets/src/ftp/ftp_response.erl
+++ b/lib/inets/src/ftp/ftp_response.erl
@@ -175,6 +175,8 @@ error_string(Reason) ->
%% Positive Preleminary Reply
interpret_status(?POS_PREL,_,_) -> pos_prel;
+%%FIXME ??? 3??? interpret_status(?POS_COMPL, ?AUTH_ACC, 3) -> tls_upgrade;
+interpret_status(?POS_COMPL, ?AUTH_ACC, 4) -> tls_upgrade;
%% Positive Completion Reply
interpret_status(?POS_COMPL,_,_) -> pos_compl;
%% Positive Intermediate Reply nedd account