diff options
| author | Micael Karlberg <[email protected]> | 2011-06-15 18:30:40 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-06-15 18:30:40 +0200 |
| commit | 90a1be0b3540af99c7bc6af6ad7bb3ebb03760d3 (patch) | |
| tree | 3be88bfc46afbc7e7bc0ac75b6b7403fd61f1b10 /lib/inets/src/inets_app | |
| parent | 7c27ae290554d9577ac7c93c5d0c6106b647dc52 (diff) | |
| parent | a6e707004f9fcb370f05bb897a6ec975f1128572 (diff) | |
| download | otp-90a1be0b3540af99c7bc6af6ad7bb3ebb03760d3.tar.gz otp-90a1be0b3540af99c7bc6af6ad7bb3ebb03760d3.tar.bz2 otp-90a1be0b3540af99c7bc6af6ad7bb3ebb03760d3.zip | |
[httpc|httpd] Added support for IPv6 with ssl.
OTP-5566
Merge branch 'bmk/inets/handle_ipv6_with_ssl2/OTP-5566' into bmk/inets/inets57_integration2
Conflicts:
lib/inets/doc/src/notes.xml
lib/inets/src/inets_app/inets.appup.src
lib/inets/test/inets_test_lib.erl
Diffstat (limited to 'lib/inets/src/inets_app')
| -rw-r--r-- | lib/inets/src/inets_app/inets.appup.src | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src index b64e266175..0c24c67fc3 100644 --- a/lib/inets/src/inets_app/inets.appup.src +++ b/lib/inets/src/inets_app/inets.appup.src @@ -20,8 +20,10 @@ [ {"5.6", [ - {load_module, httpc, soft_purge, soft_purge, []}, - {load_module, http_transport, soft_purge, soft_purge, []}, + {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, []} ] }, @@ -49,8 +51,10 @@ [ {"5.6", [ - {load_module, httpc, soft_purge, soft_purge, []}, - {load_module, http_transport, soft_purge, soft_purge, []}, + {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, []} ] }, |