diff options
| author | Micael Karlberg <[email protected]> | 2011-03-18 14:47:29 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-03-18 14:47:29 +0100 |
| commit | f4b5ea566829cad609e14c2264158665b84800c1 (patch) | |
| tree | 55fe591e7fc447e2bd8d5c636a7c431ee05dd15c /lib/inets/src/inets_app | |
| parent | e343c5b24ca4d642f327e6ec57d63094b28b2838 (diff) | |
| parent | b5aae77205c8081b79aa9ce1f1141f21f6e1fc2c (diff) | |
| download | otp-f4b5ea566829cad609e14c2264158665b84800c1.tar.gz otp-f4b5ea566829cad609e14c2264158665b84800c1.tar.bz2 otp-f4b5ea566829cad609e14c2264158665b84800c1.zip | |
Merge branch 'bmk/inets/httpd/make_mod_esi_deliver_accept_binary_data/OTP-9123' into bmk/inets/inet56_integration
Conflicts:
lib/inets/doc/src/notes.xml
lib/inets/src/inets_app/inets.appup.src
Diffstat (limited to 'lib/inets/src/inets_app')
| -rw-r--r-- | lib/inets/src/inets_app/inets.appup.src | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src index 2d12353e00..02b1826c5f 100644 --- a/lib/inets/src/inets_app/inets.appup.src +++ b/lib/inets/src/inets_app/inets.appup.src @@ -21,6 +21,7 @@ {"5.5.2", [ {load_module, ftp, 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, httpc_handler, soft, soft_purge, soft_purge, [httpc_request]} @@ -30,10 +31,11 @@ [ {load_module, ftp, soft_purge, soft_purge, []}, {load_module, http_chunk, 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, httpc_handler, soft, soft_purge, soft_purge, - [httpc_request,http_chunk]} + [httpc_request, http_chunk]} ] }, {"5.5", @@ -51,6 +53,7 @@ {"5.5.2", [ {load_module, ftp, 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, httpc_handler, soft, soft_purge, soft_purge, [httpc_request]} @@ -60,10 +63,11 @@ [ {load_module, ftp, soft_purge, soft_purge, []}, {load_module, http_chunk, 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, httpc_handler, soft, soft_purge, soft_purge, - [httpc_request,http_chunk]} + [httpc_request, http_chunk]} ] }, {"5.5", |