aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/src/inets_app
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2011-06-15 16:48:20 +0200
committerMicael Karlberg <[email protected]>2011-06-15 16:48:20 +0200
commit9d4dd02d9faf0e2a8d51b0b9a033b888afb98a0e (patch)
tree11a17aba8a96c928511f01ed11d1bffe020a67aa /lib/inets/src/inets_app
parent704ed1824308f16e0de67c6ff1eae7e80d38232f (diff)
parentdfaf00eb4fb11cdb8470401c47b15d8068b9f8cd (diff)
downloadotp-9d4dd02d9faf0e2a8d51b0b9a033b888afb98a0e.tar.gz
otp-9d4dd02d9faf0e2a8d51b0b9a033b888afb98a0e.tar.bz2
otp-9d4dd02d9faf0e2a8d51b0b9a033b888afb98a0e.zip
[ftp] FTP client doesn't work with IPv6 host.
Attila Rajmund Nohl OTP-9342 Merge branch 'bmk/inets/ftp/does_not_handle_ipv6/OTP-9342' into bmk/inets/inets57_integration2 Conflicts: lib/inets/doc/src/notes.xml lib/inets/src/inets_app/inets.appup.src
Diffstat (limited to 'lib/inets/src/inets_app')
-rw-r--r--lib/inets/src/inets_app/inets.appup.src6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src
index c432ac82eb..4aa53ae581 100644
--- a/lib/inets/src/inets_app/inets.appup.src
+++ b/lib/inets/src/inets_app/inets.appup.src
@@ -20,7 +20,8 @@
[
{"5.6",
[
- {load_module, http_transport, soft_purge, soft_purge, []}
+ {load_module, http_transport, soft_purge, soft_purge, []},
+ {update, ftp, soft, soft_purge, soft_purge, []}
]
},
{"5.5.2",
@@ -47,7 +48,8 @@
[
{"5.6",
[
- {load_module, http_transport, soft_purge, soft_purge, []}
+ {load_module, http_transport, soft_purge, soft_purge, []},
+ {update, ftp, soft, soft_purge, soft_purge, []}
]
},
{"5.5.2",