diff options
author | Micael Karlberg <[email protected]> | 2011-09-05 18:05:41 +0200 |
---|---|---|
committer | Micael Karlberg <[email protected]> | 2011-09-05 18:05:41 +0200 |
commit | 4b8958c0397765bd208dbf0dd297c654ed0c33d1 (patch) | |
tree | a657435e665c928ae22b723eb4fd3967aacf426e /lib/inets/src/http_client/httpc.erl | |
parent | cb1f02ef176767076593a1957506117d9f26dc40 (diff) | |
parent | 396b490bb3a604152d4afffac672aa0c48174c16 (diff) | |
download | otp-4b8958c0397765bd208dbf0dd297c654ed0c33d1.tar.gz otp-4b8958c0397765bd208dbf0dd297c654ed0c33d1.tar.bz2 otp-4b8958c0397765bd208dbf0dd297c654ed0c33d1.zip |
Merge branch 'bmk/inets/ossl_removed_from_ssl_app/OTP-9522' into bmk/inets/inets58_integration
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}}; (_) -> |