aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2011-04-19 13:46:09 +0200
committerMicael Karlberg <[email protected]>2011-04-19 13:46:09 +0200
commit495ed95eeda4aa37de2f7387a3f029eb907039d6 (patch)
tree3fe3cb4448f1a31af00d700bd94780d8afca41a0 /lib/inets
parentcddd6988812ae2a6e696db2f49fba5b0eee4d570 (diff)
parent29d4a0f745b69f7d2a75664b857b6ad65fca920d (diff)
downloadotp-495ed95eeda4aa37de2f7387a3f029eb907039d6.tar.gz
otp-495ed95eeda4aa37de2f7387a3f029eb907039d6.tar.bz2
otp-495ed95eeda4aa37de2f7387a3f029eb907039d6.zip
Merge branch 'bmk/inets/default_ssl/OTP-9230' into bmk/inets/inet56_integration
OTP-9230
Diffstat (limited to 'lib/inets')
-rw-r--r--lib/inets/src/inets_app/inets.appup.src4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src
index c14f8d51f6..0a590c9c36 100644
--- a/lib/inets/src/inets_app/inets.appup.src
+++ b/lib/inets/src/inets_app/inets.appup.src
@@ -24,6 +24,7 @@
{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, []},
@@ -41,6 +42,7 @@
{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, []},
@@ -70,6 +72,7 @@
{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, []},
@@ -87,6 +90,7 @@
{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, []},