aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/src
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2012-02-07 11:39:42 +0100
committerMicael Karlberg <[email protected]>2012-02-07 11:39:42 +0100
commitc67df603f88f1cd41c35bfb1d663978864689fe9 (patch)
tree47f3881f85e16466a5ac0998e949636d986d6ce4 /lib/inets/src
parentb2eeb740c6e013055603aaaee1570550d380b720 (diff)
parent4d849824fccb58764f6733c4d30a74906dd92b00 (diff)
downloadotp-c67df603f88f1cd41c35bfb1d663978864689fe9.tar.gz
otp-c67df603f88f1cd41c35bfb1d663978864689fe9.tar.bz2
otp-c67df603f88f1cd41c35bfb1d663978864689fe9.zip
Merge branch 'bmk/inets/httpd/configurable_server_tokens/OTP-9805' into bmk/inets/inets59_integration
Conflicts: lib/inets/src/inets_app/inets.appup.src
Diffstat (limited to 'lib/inets/src')
-rw-r--r--lib/inets/src/inets_app/inets.appup.src38
1 files changed, 34 insertions, 4 deletions
diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src
index f47ca98d1a..1be5a958ce 100644
--- a/lib/inets/src/inets_app/inets.appup.src
+++ b/lib/inets/src/inets_app/inets.appup.src
@@ -20,6 +20,10 @@
[
{"5.8.1",
[
+ {load_module, httpd_conf, soft_purge, soft_purge, []},
+ {load_module, httpd_response, soft_purge, soft_purge, []},
+ {load_module, httpd_script_env, soft_purge, soft_purge, []},
+
{load_module, inets, soft_purge, soft_purge, [inets_trace]},
{update, httpc_handler, soft, soft_purge, soft_purge, []},
{add_module, inets_trace}
@@ -28,33 +32,59 @@
{"5.8",
[
{load_module, inets, soft_purge, soft_purge, [inets_trace]},
+
+ {load_module, httpd_conf, soft_purge, soft_purge, []},
+ {load_module, httpd_response, soft_purge, soft_purge, []},
+ {load_module, httpd_script_env, soft_purge, soft_purge, []},
+
{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]},
+
{add_module, inets_trace}
]
+ },
+ {"5.7.2",
+ [
+ {restart_application, inets}
+ ]
}
],
[
- {"5.8.1",
+ {"5.8.1",
[
+ {load_module, httpd_conf, soft_purge, soft_purge, []},
+ {load_module, httpd_response, soft_purge, soft_purge, []},
+ {load_module, httpd_script_env, soft_purge, soft_purge, []},
+
{load_module, inets, soft_purge, soft_purge, []},
- {update, httpc_handler, soft, soft_purge, soft_purge, []},
+ {update, httpc_handler, soft, soft_purge, soft_purge, []},
{remove, {inets_trace, soft_purge, brutal_purge}}
]
},
{"5.8",
[
- {load_module, inets, soft_purge, soft_purge, [inets_trace]},
+ {load_module, inets, soft_purge, soft_purge, []},
+
+ {load_module, httpd_conf, soft_purge, soft_purge, []},
+ {load_module, httpd_response, soft_purge, soft_purge, []},
+ {load_module, httpd_script_env, soft_purge, soft_purge, []},
+
{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]},
+
{remove, {inets_trace, soft_purge, brutal_purge}}
]
- }
+ },
+ {"5.7.2",
+ [
+ {restart_application, inets}
+ ]
+ }
]
}.