diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-11-10 15:38:03 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-11-10 15:38:03 +0100 |
| commit | 3fb3067d953f8be9fe66d3a6687a86be2e8d2f3f (patch) | |
| tree | 33825e3233f32dc1916aaf1504b6cdcca0cf33ca /lib/inets/src/inets_app/inets.appup.src | |
| parent | cca58959662d473bb329e41a84b5b260bf96a26b (diff) | |
| parent | 84f29ab803e8f36ef058a47f4c2b224f4dd58220 (diff) | |
| download | otp-3fb3067d953f8be9fe66d3a6687a86be2e8d2f3f.tar.gz otp-3fb3067d953f8be9fe66d3a6687a86be2e8d2f3f.tar.bz2 otp-3fb3067d953f8be9fe66d3a6687a86be2e8d2f3f.zip | |
Merge branch 'maint-20' into maint
* maint-20:
Updated OTP version
Update release notes
Update version numbers
inets: Prepare for release
inets: Add missing guard
Avoid WindowBits=8 as per the manual
Fix deflateParams on zlib 1.2.11
Ignore empty binaries in enif_inspect_iovec
Emasculate writable binaries on entering an iovec
Only apply EOS behaviors if there's pending data
Stop assuming that all schedulers are managed when updating msacc
Diffstat (limited to 'lib/inets/src/inets_app/inets.appup.src')
| -rw-r--r-- | lib/inets/src/inets_app/inets.appup.src | 4 |
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 a86413147c..fdf4cc6e07 100644 --- a/lib/inets/src/inets_app/inets.appup.src +++ b/lib/inets/src/inets_app/inets.appup.src @@ -18,10 +18,14 @@ %% %CopyrightEnd% {"%VSN%", [ + {<<"6.4.3">>, [{load_module, httpd_esi, + soft_purge, soft_purge, []}]}, {<<"6\\..*">>,[{restart_application, inets}]}, {<<"5\\..*">>,[{restart_application, inets}]} ], [ + {<<"6.4.3">>, [{load_module, httpd_esi, + soft_purge, soft_purge, []}]}, {<<"6\\..*">>,[{restart_application, inets}]}, {<<"5\\..*">>,[{restart_application, inets}]} ] |