diff options
author | Erlang/OTP <[email protected]> | 2011-06-22 14:16:22 +0200 |
---|---|---|
committer | Erlang/OTP <[email protected]> | 2011-06-22 14:16:22 +0200 |
commit | 9cb4040e4aeed40a52f174a7c4d9106e38572605 (patch) | |
tree | b0d3caca47d76422becf4c1a2a82d687191e0b9c /lib/inets/src/inets_app/inets.appup.src | |
parent | 5eec30647ab41ad9a0c9911d2e4e300ecb501333 (diff) | |
parent | e2249b9878d396663a115628de16b1b1efde0afc (diff) | |
download | otp-9cb4040e4aeed40a52f174a7c4d9106e38572605.tar.gz otp-9cb4040e4aeed40a52f174a7c4d9106e38572605.tar.bz2 otp-9cb4040e4aeed40a52f174a7c4d9106e38572605.zip |
Merge branch 'bmk/inets/inets57_integration2' into maint-r14
* bmk/inets/inets57_integration2:
Fixed non-related test case (ticket_6035).
Corrected appup-file (missing ',').
Fixed ipv6 support detection.
(httpc) test case cleanups.
Uppdated appup-file.
Fixed IPv6 test case selection. That is if a IPv6 test case should be run or not.
Stopping httpc client...
Added test cases for httpd.
Clients started stand-alone not properly handled.
Clients started stand-alone not properly handled.
Temporary solution for profile_name stuff. What about Pids???
SSL with IPv6 now works "in principle".
[httpc] Remove unnecessary usage of iolist_to_binary when processing body (for PUT and POST). Filipe David Manana OTP-9317
Set proper version (5.7).
Set proper version (5.7).
Updated release notes.
Peer/sockname resolv doesn't work with IPv6 addrs in HTTP. OTP-9343
OTP-9342: FTP client doesn't work with IPv6 OTP-9342: IpFamily config option was not handled OTP-9342: Release notes remain... OTP-9342: <credit>attila rajmund nohl</credit>
Diffstat (limited to 'lib/inets/src/inets_app/inets.appup.src')
-rw-r--r-- | lib/inets/src/inets_app/inets.appup.src | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src index 47f3fbba58..8b0fcb185d 100644 --- a/lib/inets/src/inets_app/inets.appup.src +++ b/lib/inets/src/inets_app/inets.appup.src @@ -18,6 +18,15 @@ {"%VSN%", [ + {"5.6", + [ + {load_module, httpc, soft_purge, soft_purge, [httpc_manager]}, + {load_module, http_transport, soft_purge, soft_purge, [http_transport]}, + {update, httpc_handler, soft, soft_purge, soft_purge, []}, + {update, httpc_manager, soft, soft_purge, soft_purge, [httpc_handler]}, + {update, ftp, soft, soft_purge, soft_purge, []} + ] + }, {"5.5.2", [ {restart_application, inets} @@ -40,6 +49,15 @@ } ], [ + {"5.6", + [ + {load_module, httpc, soft_purge, soft_purge, [httpc_manager]}, + {load_module, http_transport, soft_purge, soft_purge, [http_transport]}, + {update, httpc_handler, soft, soft_purge, soft_purge, []}, + {update, httpc_manager, soft, soft_purge, soft_purge, [httpc_handler]}, + {update, ftp, soft, soft_purge, soft_purge, []} + ] + }, {"5.5.2", [ {restart_application, inets} |