aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/src/inets_app/inets.appup.src
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2011-05-11 12:05:11 +0200
committerIngela Anderton Andin <[email protected]>2011-05-11 16:14:07 +0200
commit5d32eaf750cff98d242c8048eeb6b49c94fb6ee6 (patch)
tree6277bd5d272a1c0ae98be67c35734b4f16e36ff9 /lib/inets/src/inets_app/inets.appup.src
parent495ed95eeda4aa37de2f7387a3f029eb907039d6 (diff)
downloadotp-5d32eaf750cff98d242c8048eeb6b49c94fb6ee6.tar.gz
otp-5d32eaf750cff98d242c8048eeb6b49c94fb6ee6.tar.bz2
otp-5d32eaf750cff98d242c8048eeb6b49c94fb6ee6.zip
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.
Diffstat (limited to 'lib/inets/src/inets_app/inets.appup.src')
-rw-r--r--lib/inets/src/inets_app/inets.appup.src60
1 files changed, 4 insertions, 56 deletions
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",