diff options
author | Micael Karlberg <[email protected]> | 2012-07-11 11:15:23 +0200 |
---|---|---|
committer | Micael Karlberg <[email protected]> | 2012-07-11 11:15:23 +0200 |
commit | 03dd7037e055e0879d4e8565518d61bd5f1870f7 (patch) | |
tree | 06073d04b74c9c135783630dda581d21d6b165f7 /lib/inets/src/inets_app | |
parent | 1b726abb2b874e00870c5bca2ef3e9d52828cd17 (diff) | |
parent | ef14221acafe78b7a77b5d42b6a615fa7333750d (diff) | |
download | otp-03dd7037e055e0879d4e8565518d61bd5f1870f7.tar.gz otp-03dd7037e055e0879d4e8565518d61bd5f1870f7.tar.bz2 otp-03dd7037e055e0879d4e8565518d61bd5f1870f7.zip |
Merge branch 'bmk/inets/httpc/cancel_request/OTP-10092' into bmk/inets/inets591_integration
Diffstat (limited to 'lib/inets/src/inets_app')
-rw-r--r-- | lib/inets/src/inets_app/inets.appup.src | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src index c7029f7b31..93fd5b9595 100644 --- a/lib/inets/src/inets_app/inets.appup.src +++ b/lib/inets/src/inets_app/inets.appup.src @@ -18,6 +18,11 @@ {"%VSN%", [ + {"5.9", + [ + {update, httpc_manager, soft, soft_purge, soft_purge, []} + ] + }, {"5.8.1", [ {load_module, http_uri, soft_purge, soft_purge, []}, @@ -35,6 +40,7 @@ {load_module, httpd_script_env, soft_purge, soft_purge, []}, {load_module, inets, soft_purge, soft_purge, [inets_trace]}, + {update, httpc_manager, soft, soft_purge, soft_purge, []}, {update, httpc_handler, soft, soft_purge, soft_purge, []}, {update, httpd_sup, soft, soft_purge, soft_purge, []}, {add_module, inets_trace} @@ -74,6 +80,11 @@ } ], [ + {"5.9", + [ + {update, httpc_manager, soft, soft_purge, soft_purge, []} + ] + }, {"5.8.1", [ {load_module, http_uri, soft_purge, soft_purge, []}, @@ -91,6 +102,7 @@ {load_module, httpd_script_env, soft_purge, soft_purge, []}, {load_module, inets, soft_purge, soft_purge, []}, + {update, httpc_manager, soft, soft_purge, soft_purge, []}, {update, httpc_handler, soft, soft_purge, soft_purge, []}, {update, httpd_sup, soft, soft_purge, soft_purge, []}, {remove, {inets_trace, soft_purge, brutal_purge}} |