aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2012-03-15 12:59:56 +0100
committerMicael Karlberg <[email protected]>2012-03-15 12:59:56 +0100
commit85fded451253d400e02040c0db9ca6915075f89f (patch)
treed0533fc8d5d16847345a5da8e6f5168360f4395e
parentec6337c42085728edac30d9fa7307f7911bd0391 (diff)
parent48d888e192b243964d80a7717789458d38107cf6 (diff)
downloadotp-85fded451253d400e02040c0db9ca6915075f89f.tar.gz
otp-85fded451253d400e02040c0db9ca6915075f89f.tar.bz2
otp-85fded451253d400e02040c0db9ca6915075f89f.zip
Merge branch 'bmk/inets/official_http_uri/OTP-9983' into bmk/inets/inets59_integration2
-rw-r--r--lib/inets/src/inets_app/inets.appup.src32
1 files changed, 24 insertions, 8 deletions
diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src
index 9dfa16b405..c7029f7b31 100644
--- a/lib/inets/src/inets_app/inets.appup.src
+++ b/lib/inets/src/inets_app/inets.appup.src
@@ -20,8 +20,12 @@
[
{"5.8.1",
[
- {load_module, httpc, soft_purge, soft_purge, [httpc_manager]},
- {update, httpc_manager, soft, soft_purge, soft_purge, []},
+ {load_module, http_uri, soft_purge, soft_purge, []},
+ {load_module, httpc_response, soft_purge, soft_purge, [http_uri]},
+
+ {load_module, httpc, soft_purge, soft_purge,
+ [http_uri, httpc_manager]},
+ {update, httpc_manager, soft, soft_purge, soft_purge, [http_uri]},
{load_module, inets_app, soft_purge, soft_purge, [inets_sup]},
{update, inets_sup, soft, soft_purge, soft_purge, []},
@@ -38,7 +42,11 @@
},
{"5.8",
[
- {load_module, httpc, soft_purge, soft_purge, [httpc_manager]},
+ {load_module, http_uri, soft_purge, soft_purge, []},
+ {load_module, httpc_response, soft_purge, soft_purge, [http_uri]},
+
+ {load_module, httpc, soft_purge, soft_purge,
+ [http_uri, httpc_manager]},
{load_module, inets_app, soft_purge, soft_purge, [inets_sup]},
{update, inets_sup, soft, soft_purge, soft_purge, []},
@@ -53,7 +61,7 @@
{update, httpc_handler, {advanced, upgrade_from_pre_5_8_1},
soft_purge, soft_purge, []},
{update, httpc_manager, {advanced, upgrade_from_pre_5_8_1},
- soft_purge, soft_purge, [httpc_handler]},
+ soft_purge, soft_purge, [http_uri, httpc_handler]},
{update, httpd_sup, soft, soft_purge, soft_purge, []},
{add_module, inets_trace}
@@ -68,8 +76,12 @@
[
{"5.8.1",
[
- {load_module, httpc, soft_purge, soft_purge, [httpc_manager]},
- {update, httpc_manager, soft, soft_purge, soft_purge, []},
+ {load_module, http_uri, soft_purge, soft_purge, []},
+ {load_module, httpc_response, soft_purge, soft_purge, [http_uri]},
+
+ {load_module, httpc, soft_purge, soft_purge,
+ [http_uri, httpc_manager]},
+ {update, httpc_manager, soft, soft_purge, soft_purge, [http_uri]},
{load_module, inets_app, soft_purge, soft_purge, [inets_sup]},
{update, inets_sup, soft, soft_purge, soft_purge, []},
@@ -86,7 +98,11 @@
},
{"5.8",
[
- {load_module, httpc, soft_purge, soft_purge, [httpc_manager]},
+ {load_module, http_uri, soft_purge, soft_purge, []},
+ {load_module, httpc_response, soft_purge, soft_purge, [http_uri]},
+
+ {load_module, httpc, soft_purge, soft_purge,
+ [http_uri, httpc_manager]},
{load_module, inets_app, soft_purge, soft_purge, [inets_sup]},
{update, inets_sup, soft, soft_purge, soft_purge, []},
@@ -101,7 +117,7 @@
{update, httpc_handler, {advanced, upgrade_from_pre_5_8_1},
soft_purge, soft_purge, []},
{update, httpc_manager, {advanced, upgrade_from_pre_5_8_1},
- soft_purge, soft_purge, [httpc_handler]},
+ soft_purge, soft_purge, [http_uri, httpc_handler]},
{update, httpd_sup, soft, soft_purge, soft_purge, []},
{remove, {inets_trace, soft_purge, brutal_purge}}