Merge branch 'bmk/inets/httpc/checking_ipv6_on_windows' into bmk/inets/inets59_integration

1 files changed, 21 insertions, 43 deletions

diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src
index e80cb2a23b..f47ca98d1a 100644
--- a/lib/inets/src/inets_app/inets.appup.src
+++ b/lib/inets/src/inets_app/inets.appup.src
@@ -18,65 +18,43 @@
 
 {"%VSN%",
  [
+  {"5.8.1", 
+   [
+    {load_module, inets,         soft_purge, soft_purge, [inets_trace]},
+    {update,      httpc_handler, soft, soft_purge, soft_purge, []},
+    {add_module,  inets_trace}
+   ]
+  }, 
   {"5.8",
    [
+    {load_module, inets, soft_purge, soft_purge, [inets_trace]},
     {load_module, ftp, soft_purge, soft_purge, []}, 
     {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]}
-   ]
-  }, 
-  {"5.7.2", 
-   [
-    {restart_application, inets}
-   ]
-  }, 
-  {"5.7.1", 
-   [
-    {restart_application, inets}
+     soft_purge, soft_purge, [httpc_handler]},
+    {add_module,  inets_trace}
    ]
-  }, 
-  {"5.7", 
+  }
+ ],
+ [
+  {"5.8.1", 
    [
-    {restart_application, inets}
+    {load_module, inets,         soft_purge, soft_purge, []},
+    {update,      httpc_handler, soft, soft_purge, soft_purge, []}, 
+    {remove,      {inets_trace, soft_purge, brutal_purge}}
    ]
   }, 
-  {"5.6", 
-   [
-    {restart_application, inets}
-   ]
-  } 
- ],
- [
   {"5.8",
    [
+    {load_module, inets, soft_purge, soft_purge, [inets_trace]},
     {load_module, ftp, soft_purge, soft_purge, []}, 
     {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]}
-   ]
-  }, 
-  {"5.7.2", 
-   [
-    {restart_application, inets}
-   ]
-  }, 
-  {"5.7.1", 
-   [
-    {restart_application, inets}
-   ]
-  }, 
-  {"5.7", 
-   [
-    {restart_application, inets}
-   ]
-  }, 
-  {"5.6", 
-   [
-    {restart_application, inets}
+     soft_purge, soft_purge, [httpc_handler]},
+    {remove,      {inets_trace, soft_purge, brutal_purge}}
    ]
-  } 
+  }
  ]
 }.