From 5d32eaf750cff98d242c8048eeb6b49c94fb6ee6 Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Wed, 11 May 2011 12:05:11 +0200
Subject: Fixed httpc manager crash

httpc manager crashes.When a request results in a retry, the request
id will be "reused" in the previous implementation a race condition
could occur causing the manager to crash. This is now avoided by using
proc_lib:init_ack and gen_server:enter_loop to allow more advanced
initialization of httpc_handlers without blocking the httpc_manger
and eliminating extra processes that can cause race conditions.
---
 lib/inets/src/inets_app/inets.appup.src | 60 +++------------------------------
 1 file changed, 4 insertions(+), 56 deletions(-)

(limited to 'lib/inets/src/inets_app/inets.appup.src')

diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src
index 0a590c9c36..91fb064eec 100644
--- a/lib/inets/src/inets_app/inets.appup.src
+++ b/lib/inets/src/inets_app/inets.appup.src
@@ -20,38 +20,12 @@
  [
   {"5.5.2", 
    [
-    {load_module, ftp, soft_purge, soft_purge, []},
-    {load_module, http_util, soft_purge, soft_purge, []},
-    {load_module, http_transport, soft_purge, soft_purge, []},
-    {load_module, httpd_util, soft_purge, soft_purge, [http_util]},
-    {load_module, httpd_conf, soft_purge, soft_purge, []},
-    {load_module, httpd_file, soft_purge, soft_purge, []},
-    {load_module, httpd_log, soft_purge, soft_purge, []},
-    {load_module, mod_esi, soft_purge, soft_purge, []},
-    {load_module, httpc, soft_purge, soft_purge, [httpc_handler]},
-    {load_module, httpc_request, soft_purge, soft_purge, []},
-    {update, httpd_sup, soft, soft_purge, soft_purge, [http_transport]},
-    {update, httpd_request_handler, soft, soft_purge, soft_purge, []},
-    {update, httpc_handler, soft, soft_purge, soft_purge, [httpc_request]}
+   {restart_application, inets}
    ]
   }, 
   {"5.5.1", 
    [
-    {load_module, ftp, soft_purge, soft_purge, []}, 
-    {load_module, http_chunk, soft_purge, soft_purge, []},
-    {load_module, http_util, soft_purge, soft_purge, []},
-    {load_module, http_transport, soft_purge, soft_purge, []},
-    {load_module, httpd_util, soft_purge, soft_purge, [http_util]},
-    {load_module, httpd_conf, soft_purge, soft_purge, []},
-    {load_module, httpd_file, soft_purge, soft_purge, []},
-    {load_module, httpd_log, soft_purge, soft_purge, []},
-    {load_module, mod_esi, soft_purge, soft_purge, []},
-    {load_module, httpc, soft_purge, soft_purge, [httpc_handler]},
-    {load_module, httpc_request, soft_purge, soft_purge, []},
-    {update, httpd_sup, soft, soft_purge, soft_purge, [http_transport]},
-    {update, httpd_request_handler, soft, soft_purge, soft_purge, []},
-    {update, httpc_handler, soft, soft_purge, soft_purge, 
-     [httpc_request, http_chunk]}
+     {restart_application, inets}
    ]
   }, 
   {"5.5",
@@ -68,38 +42,12 @@
  [
   {"5.5.2",
    [
-    {load_module, ftp, soft_purge, soft_purge, []}, 
-    {load_module, http_util, soft_purge, soft_purge, []},
-    {load_module, http_transport, soft_purge, soft_purge, []},
-    {load_module, httpd_util, soft_purge, soft_purge, [http_util]},
-    {load_module, httpd_conf, soft_purge, soft_purge, []},
-    {load_module, httpd_file, soft_purge, soft_purge, []},
-    {load_module, httpd_log, soft_purge, soft_purge, []},
-    {load_module, mod_esi, soft_purge, soft_purge, []},
-    {load_module, httpc, soft_purge, soft_purge, [httpc_handler]},
-    {load_module, httpc_request, soft_purge, soft_purge, []},
-    {update, httpd_sup, soft, soft_purge, soft_purge, [http_transport]},
-    {update, httpd_request_handler, soft, soft_purge, soft_purge, []},
-    {update, httpc_handler, soft, soft_purge, soft_purge, [httpc_request]}
+   {restart_application, inets}
    ]
   },
   {"5.5.1", 
    [
-    {load_module, ftp, soft_purge, soft_purge, []}, 
-    {load_module, http_chunk, soft_purge, soft_purge, []},
-    {load_module, http_util, soft_purge, soft_purge, []},
-    {load_module, http_transport, soft_purge, soft_purge, []},
-    {load_module, httpd_util, soft_purge, soft_purge, [http_util]},
-    {load_module, httpd_conf, soft_purge, soft_purge, []},
-    {load_module, httpd_file, soft_purge, soft_purge, []},
-    {load_module, httpd_log, soft_purge, soft_purge, []},
-    {load_module, mod_esi, soft_purge, soft_purge, []},
-    {load_module, httpc, soft_purge, soft_purge, [httpc_handler]},
-    {load_module, httpc_request, soft_purge, soft_purge, []},
-    {update, httpd_sup, soft, soft_purge, soft_purge, [http_transport]},
-    {update, httpd_request_handler, soft, soft_purge, soft_purge, []},
-    {update, httpc_handler, soft, soft_purge, soft_purge, 
-     [httpc_request, http_chunk]}
+   {restart_application, inets}
    ]
   }, 
   {"5.5",
-- 
cgit v1.2.3