aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/src/inets_app/inets.app.src
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2011-09-09 12:22:52 +0200
committerMicael Karlberg <[email protected]>2011-09-09 12:22:52 +0200
commita9ada1d7c71eaeebdfbe8295c1cfdf8e23c81203 (patch)
tree612f52c27a693e57feff96f1bfa0fa1d01e0a0af /lib/inets/src/inets_app/inets.app.src
parentf602ae4f0c727c1ff37e69887ba33f46b24c54e1 (diff)
parent4b8958c0397765bd208dbf0dd297c654ed0c33d1 (diff)
downloadotp-a9ada1d7c71eaeebdfbe8295c1cfdf8e23c81203.tar.gz
otp-a9ada1d7c71eaeebdfbe8295c1cfdf8e23c81203.tar.bz2
otp-a9ada1d7c71eaeebdfbe8295c1cfdf8e23c81203.zip
Merge branch 'bmk/inets/inets58_integration' into major
[httpc] Deprecated interface module <c>http</c> has been removed. It has (long) been replaced by http client interface module httpc. OTP-9359 [httpc|httpd] The old ssl implementation (based on OpenSSL), has been deprecated. The config option that specified usage of this version of the ssl app, *ossl*, has been removed. OTP-9522
Diffstat (limited to 'lib/inets/src/inets_app/inets.app.src')
-rw-r--r--lib/inets/src/inets_app/inets.app.src3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/inets/src/inets_app/inets.app.src b/lib/inets/src/inets_app/inets.app.src
index cb036157a5..4d0defb329 100644
--- a/lib/inets/src/inets_app/inets.app.src
+++ b/lib/inets/src/inets_app/inets.app.src
@@ -34,8 +34,7 @@
ftp_sup,
%% HTTP client:
- http, %% Old client API module
- httpc, %% New client API module
+ httpc,
httpc_handler,
httpc_handler_sup,
httpc_manager,