diff options
| author | Micael Karlberg <[email protected]> | 2011-09-09 12:22:52 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-09-09 12:22:52 +0200 |
| commit | a9ada1d7c71eaeebdfbe8295c1cfdf8e23c81203 (patch) | |
| tree | 612f52c27a693e57feff96f1bfa0fa1d01e0a0af /lib/inets/src/http_client/httpc.erl | |
| parent | f602ae4f0c727c1ff37e69887ba33f46b24c54e1 (diff) | |
| parent | 4b8958c0397765bd208dbf0dd297c654ed0c33d1 (diff) | |
| download | otp-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/http_client/httpc.erl')
| -rw-r--r-- | lib/inets/src/http_client/httpc.erl | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/lib/inets/src/http_client/httpc.erl b/lib/inets/src/http_client/httpc.erl index fe8e93af1f..75c26c63cc 100644 --- a/lib/inets/src/http_client/httpc.erl +++ b/lib/inets/src/http_client/httpc.erl @@ -105,7 +105,6 @@ request(Url, Profile) -> %% {ssl, SSLOptions} | {proxy_auth, {User, Password}} %% Ssloptions = ssl_options() | %% {ssl, ssl_options()} | -%% {ossl, ssl_options()} | %% {essl, ssl_options()} %% ssl_options() = [ssl_option()] %% ssl_option() = {verify, code()} | @@ -644,8 +643,6 @@ http_options_default() -> {ok, {?HTTP_DEFAULT_SSL_KIND, Value}}; ({ssl, SslOptions}) when is_list(SslOptions) -> {ok, {?HTTP_DEFAULT_SSL_KIND, SslOptions}}; - ({ossl, SslOptions}) when is_list(SslOptions) -> - {ok, {ossl, SslOptions}}; ({essl, SslOptions}) when is_list(SslOptions) -> {ok, {essl, SslOptions}}; (_) -> |