diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-01-31 15:34:51 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-02-05 10:32:22 +0100 |
| commit | 0047d213e4e345fc04bb492ed877a35d67d86969 (patch) | |
| tree | 531cb745d9852c25911c627a49c6a58a94b6bc72 /lib/inets/src/http_lib | |
| parent | b9d6b674e70b99ce97c6ab9de3c04d3e20c320be (diff) | |
| download | otp-0047d213e4e345fc04bb492ed877a35d67d86969.tar.gz otp-0047d213e4e345fc04bb492ed877a35d67d86969.tar.bz2 otp-0047d213e4e345fc04bb492ed877a35d67d86969.zip | |
inets: Improve ssl handling
httpc: CTfy test suite
httpd: Simplify ssl configuration OTP-10846
Diffstat (limited to 'lib/inets/src/http_lib')
| -rw-r--r-- | lib/inets/src/http_lib/http_transport.erl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/inets/src/http_lib/http_transport.erl b/lib/inets/src/http_lib/http_transport.erl index 8b103628d7..1692dcad78 100644 --- a/lib/inets/src/http_lib/http_transport.erl +++ b/lib/inets/src/http_lib/http_transport.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2004-2011. All Rights Reserved. +%% Copyright Ericsson AB 2004-2013. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -184,7 +184,9 @@ listen({essl, SSLConfig}, Addr, Port) -> listen(ip_comm, Addr, Port, Fd) -> - listen_ip_comm(Addr, Port, Fd). + listen_ip_comm(Addr, Port, Fd); +listen({_, SSLConfig}, Addr, Port, _Fd) -> + listen_ssl(Addr, Port, SSLConfig). listen_ip_comm(Addr, Port, Fd) -> case (catch do_listen_ip_comm(Addr, Port, Fd)) of |