diff options
| author | Péter Dimitrov <[email protected]> | 2018-03-06 11:01:56 +0100 |
|---|---|---|
| committer | Péter Dimitrov <[email protected]> | 2018-03-06 11:01:56 +0100 |
| commit | 90562de18c49f66330c2f8bf06d37ac0357f0e49 (patch) | |
| tree | 6cceb3d0701ab4f8bd6e22bb7b2f3e76df48cf7f /lib/inets/src/inets_app | |
| parent | 2af61b05c1232a21be567bd0950adba94693589e (diff) | |
| parent | b8b3abfacb40d147ec834cc18742b356d6b03236 (diff) | |
| download | otp-90562de18c49f66330c2f8bf06d37ac0357f0e49.tar.gz otp-90562de18c49f66330c2f8bf06d37ac0357f0e49.tar.bz2 otp-90562de18c49f66330c2f8bf06d37ac0357f0e49.zip | |
Merge branch 'maint'
* maint:
inets: Prepare for release
inets: Skip http_unix_socket test group on Windows
inets: Add unix domain socket support to httpc
Change-Id: I4c3a3d6e4fbbdf82e4e2e7d30b84510f9c286c68
Diffstat (limited to 'lib/inets/src/inets_app')
| -rw-r--r-- | lib/inets/src/inets_app/inets.appup.src | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src index e24a4a8694..a86413147c 100644 --- a/lib/inets/src/inets_app/inets.appup.src +++ b/lib/inets/src/inets_app/inets.appup.src @@ -18,14 +18,10 @@ %% %CopyrightEnd% {"%VSN%", [ - {<<"6.4.5">>, [{load_module, httpc_handler, - soft_purge, soft_purge, []}]}, {<<"6\\..*">>,[{restart_application, inets}]}, {<<"5\\..*">>,[{restart_application, inets}]} ], [ - {<<"6.4.5">>, [{load_module, httpc_handler, - soft_purge, soft_purge, []}]}, {<<"6\\..*">>,[{restart_application, inets}]}, {<<"5\\..*">>,[{restart_application, inets}]} ] |