Merge branch 'bmk/inets/inets581_integration/r15' into maint-r15

* bmk/inets/inets581_integration/r15:
  [inets/httpc] The client incorrectly streams 404 responses
  [inets/httpc] Add proper code change code
  [inets/httpc] Add test case
  [inets] Add proper release notes for OTP-9847
  [inets/httpc] Fix the selection of session for keep-alive mode When selecting a session, the "state" of the session (specifically if the server has responded) was not taken into account. Attempting to fix this, a "state" field (actually available) has been added to the session record.
  [ftp] Fails to open IPv6 connection

1 files changed, 19 insertions, 1 deletions

diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src
index 779dd8e439..e80cb2a23b 100644
--- a/lib/inets/src/inets_app/inets.appup.src
+++ b/lib/inets/src/inets_app/inets.appup.src
@@ -1,7 +1,7 @@
 %% This is an -*- erlang -*- file.
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -18,6 +18,15 @@
 
 {"%VSN%",
  [
+  {"5.8",
+   [
+    {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}
@@ -40,6 +49,15 @@
   } 
  ],
  [
+  {"5.8",
+   [
+    {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}