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/test/inets_test_lib.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/test/inets_test_lib.erl')
| -rw-r--r-- | lib/inets/test/inets_test_lib.erl | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/lib/inets/test/inets_test_lib.erl b/lib/inets/test/inets_test_lib.erl index 2e19c41f16..ddb1a49394 100644 --- a/lib/inets/test/inets_test_lib.erl +++ b/lib/inets/test/inets_test_lib.erl @@ -340,9 +340,6 @@ connect_bin(SockType, Host, Port) -> connect_bin(ssl, Host, Port, Opts0) -> Opts = [binary, {packet,0} | Opts0], connect(ssl, Host, Port, Opts); -connect_bin(ossl, Host, Port, Opts0) -> - Opts = [{ssl_imp, old}, binary, {packet,0} | Opts0], - connect(ssl, Host, Port, Opts); connect_bin(essl, Host, Port, Opts0) -> Opts = [{ssl_imp, new}, binary, {packet,0}, {reuseaddr, true} | Opts0], connect(ssl, Host, Port, Opts); @@ -357,9 +354,6 @@ connect_byte(SockType, Host, Port) -> connect_byte(ssl, Host, Port, Opts0) -> Opts = [{packet,0} | Opts0], connect(ssl, Host, Port, Opts); -connect_byte(ossl, Host, Port, Opts0) -> - Opts = [{ssl_imp, old}, {packet,0} | Opts0], - connect(ssl, Host, Port, Opts); connect_byte(essl, Host, Port, Opts0) -> Opts = [{ssl_imp, new}, {packet,0} | Opts0], connect(ssl, Host, Port, Opts); @@ -421,8 +415,6 @@ connect(ip_comm, Host, Port, Opts) -> send(ssl, Socket, Data) -> ssl:send(Socket, Data); -send(ossl, Socket, Data) -> - ssl:send(Socket, Data); send(essl, Socket, Data) -> ssl:send(Socket, Data); send(ip_comm,Socket,Data) -> @@ -431,8 +423,6 @@ send(ip_comm,Socket,Data) -> close(ssl,Socket) -> catch ssl:close(Socket); -close(ossl,Socket) -> - catch ssl:close(Socket); close(essl,Socket) -> catch ssl:close(Socket); close(ip_comm,Socket) -> |