aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/src/inets_app
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2011-09-19 19:31:42 +0200
committerMicael Karlberg <[email protected]>2011-09-19 19:31:42 +0200
commit368449d2316b0f0f7c0dce55a9dd47c3acadb76d (patch)
tree5b38a054ca7918f486992aef39ecf11305f021e2 /lib/inets/src/inets_app
parent7c730a573a7e239f41bc619b024a675667767428 (diff)
parent1fd7edb98877afdf8e044ee8f4f3c1f9fca371ce (diff)
downloadotp-368449d2316b0f0f7c0dce55a9dd47c3acadb76d.tar.gz
otp-368449d2316b0f0f7c0dce55a9dd47c3acadb76d.tar.bz2
otp-368449d2316b0f0f7c0dce55a9dd47c3acadb76d.zip
Merge branch 'bmk/inets/httpd/windows_dir_traversal/OTP-OTP-9561' into bmk/inets/inets571_integration
Conflicts: lib/inets/doc/src/notes.xml
Diffstat (limited to 'lib/inets/src/inets_app')
-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 301bc2d58a..d5fdf86a60 100644
--- a/lib/inets/src/inets_app/inets.appup.src
+++ b/lib/inets/src/inets_app/inets.appup.src
@@ -20,12 +20,14 @@
[
{"5.7",
[
+ {load_module, httpd_request, soft_purge, soft_purge, []},
{load_module, httpc_cookie, soft_purge, soft_purge, [http_util]},
{load_module, http_util, soft_purge, soft_purge, []}
]
},
{"5.6",
[
+ {load_module, httpd_request, soft_purge, soft_purge, []},
{load_module, httpc, soft_purge, soft_purge, [httpc_manager]},
{load_module, http_transport, soft_purge, soft_purge, [http_transport]},
{load_module, httpc_cookie, soft_purge, soft_purge, [http_util]},
@@ -59,12 +61,14 @@
[
{"5.7",
[
+ {load_module, httpd_request, soft_purge, soft_purge, []},
{load_module, httpc_cookie, soft_purge, soft_purge, [http_util]},
{load_module, http_util, soft_purge, soft_purge, []}
]
},
{"5.6",
[
+ {load_module, httpd_request, soft_purge, soft_purge, []},
{load_module, httpc, soft_purge, soft_purge, [httpc_manager]},
{load_module, http_transport, soft_purge, soft_purge, [http_transport]},
{load_module, httpc_cookie, soft_purge, soft_purge, [http_util]},